Skip to content

Commit 6ee7af5

Browse files
Shinnosukeysgroobyming
authored andcommitted
fix(k8s-dbs): 修复vm集群的select和insert节点无法多节点并发重启更新 TencentBlueKing#10809
1 parent 3d6fc75 commit 6ee7af5

File tree

7 files changed

+13
-45
lines changed

7 files changed

+13
-45
lines changed

dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/victoriametrics/templates/cmpd-vminsert.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,4 @@ spec:
7878
initialDelaySeconds: 5
7979
periodSeconds: 15
8080
timeoutSeconds: 5
81-
failureThreshold: 3
82-
- name: sidecar
83-
image: docker.io/apecloud/kubeblocks-tools:0.8.2
84-
command: [ "/scripts/sidecar.sh" ]
85-
resources:
86-
requests:
87-
cpu: "100m"
88-
memory: "128Mi"
89-
limits:
90-
cpu: "200m"
91-
memory: "256Mi"
92-
volumeMounts:
93-
- name: scripts
94-
mountPath: /scripts
95-
scripts:
96-
- name: tidb-scripts
97-
templateRef: {{ include "vm.cmScriptsName" . }}
98-
namespace: {{ .Release.Namespace }}
99-
volumeName: scripts
81+
failureThreshold: 3

dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/victoriametrics/templates/cmpd-vmselect.yaml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,4 @@ spec:
8484
initialDelaySeconds: 5
8585
periodSeconds: 15
8686
timeoutSeconds: 5
87-
failureThreshold: 3
88-
- name: sidecar
89-
image: docker.io/apecloud/kubeblocks-tools:0.8.2
90-
command: [ "/scripts/sidecar.sh" ]
91-
resources:
92-
requests:
93-
cpu: "100m"
94-
memory: "128Mi"
95-
limits:
96-
cpu: "200m"
97-
memory: "256Mi"
98-
volumeMounts:
99-
- name: scripts
100-
mountPath: /scripts
101-
scripts:
102-
- name: tidb-scripts
103-
templateRef: {{ include "vm.cmScriptsName" . }}
104-
namespace: {{ .Release.Namespace }}
105-
volumeName: scripts
87+
failureThreshold: 3

dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/victoriametrics/templates/cmpd-vmstorage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
serviceKind: victoriametrics
77
serviceVersion: 1.93.10
8-
updateStrategy: BestEffortParallel
8+
updateStrategy: Serial
99
exporter:
1010
scrapePath: /metrics
1111
scrapePort: http

dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/victoriametrics/templates/cmpv-vminsert.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ spec:
1414
serviceVersion: 1.93.10
1515
images:
1616
vminsert: victoriametrics/vminsert:v1.93.10-cluster
17-
sidecar: bitnami/kubectl:1.29
1817
- name: vminsert-1.115.0
1918
serviceVersion: 1.115.0
2019
images:
21-
vminsert: victoriametrics/vminsert:v1.115.0-cluster
22-
sidecar: bitnami/kubectl:1.29
20+
vminsert: victoriametrics/vminsert:v1.115.0-cluster

dbm-services/k8s-dbs/k8s-utils/helm/storageAddon/victoriametrics/templates/cmpv-vmselect.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ spec:
1414
serviceVersion: 1.93.10
1515
images:
1616
vmselect: victoriametrics/vmselect:v1.93.10-cluster
17-
sidecar: bitnami/kubectl:1.29
1817
- name: vmselect-1.115.0
1918
serviceVersion: 1.115.0
2019
images:
21-
vmselect: victoriametrics/vmselect:v1.115.0-cluster
22-
sidecar: bitnami/kubectl:1.29
20+
vmselect: victoriametrics/vmselect:v1.115.0-cluster

dbm-services/k8s-dbs/k8s-utils/helm/storageAddonCluster/victoriametrics-cluster/templates/cluster.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ spec:
1717
- name: vminsert
1818
serviceVersion: {{ .serviceVersion }}
1919
serviceAccountName: {{ include "victoriametrics.serviceAccountName" $ }}
20+
instanceUpdateStrategy:
21+
maxUnavailable: {{ .instanceUpdateStrategy.maxUnavailable }}
2022
{{- with .env }}
2123
env:
2224
{{- range $key, $value := . }}
@@ -38,6 +40,8 @@ spec:
3840
- name: vmselect
3941
serviceVersion: {{ .serviceVersion }}
4042
serviceAccountName: {{ include "victoriametrics.serviceAccountName" $ }}
43+
instanceUpdateStrategy:
44+
maxUnavailable: {{ .instanceUpdateStrategy.maxUnavailable }}
4145
{{- with .env }}
4246
env:
4347
{{- range $key, $value := . }}

dbm-services/k8s-dbs/k8s-utils/helm/storageAddonCluster/victoriametrics-cluster/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ topoName: victoriametrics
1313
componentList:
1414
- componentName: vminsert
1515
serviceVersion: "1.93.10"
16+
instanceUpdateStrategy:
17+
maxUnavailable: 25%
1618
env:
1719
replicas: 1
1820
resources:
@@ -25,6 +27,8 @@ componentList:
2527

2628
- componentName: vmselect
2729
serviceVersion: "1.93.10"
30+
instanceUpdateStrategy:
31+
maxUnavailable: 25%
2832
env:
2933
replicas: 1
3034
resources:

0 commit comments

Comments
 (0)