Skip to content

Commit f6451e3

Browse files
authored
Revert "fix(tidb): PD roleProbe peer fallback + remove externalManaged" (#2958)
1 parent 2e169dd commit f6451e3

5 files changed

Lines changed: 9 additions & 157 deletions

File tree

addons/tidb/scripts-ut-spec/pd_role_probe_spec.sh

Lines changed: 0 additions & 123 deletions
This file was deleted.

addons/tidb/scripts/pd_role_probe.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

addons/tidb/templates/cmpd-pd.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ spec:
8080
template: {{ include "tidb.pd.configTplName" . }}
8181
namespace: {{ .Release.Namespace }}
8282
volumeName: config
83+
externalManaged: true
8384
reconfigure:
8485
exec:
8586
container: pd
@@ -103,13 +104,17 @@ spec:
103104
participatesInQuorum: true
104105
lifecycleActions:
105106
roleProbe:
106-
timeoutSeconds: 5
107107
exec:
108108
command:
109109
- bash
110110
- -c
111111
- |
112-
{{- .Files.Get "scripts/pd_role_probe.sh" | nindent 12 }}
112+
LEADER_NAME=$(/pd-ctl member | jq -r '.leader.name')
113+
if [ "$LEADER_NAME" == "$HOSTNAME" ]; then
114+
echo -n "leader"
115+
else
116+
echo -n "follower"
117+
fi
113118
memberLeave:
114119
exec:
115120
command:

addons/tidb/templates/cmpd-tidb.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ spec:
9090
template: {{ include "tidb.tidb.configTplName" . }}
9191
namespace: {{ .Release.Namespace }}
9292
volumeName: config
93+
externalManaged: true
9394
systemAccounts:
9495
- name: root
9596
initAccount: true

addons/tidb/templates/cmpd-tikv.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ spec:
7878
template: {{ include "tidb.tikv.configTplName" . }}
7979
namespace: {{ .Release.Namespace }}
8080
volumeName: config
81+
externalManaged: true
8182
lifecycleActions:
8283
memberLeave:
8384
exec:

0 commit comments

Comments
 (0)