Skip to content

Commit d00317f

Browse files
SlachSlach
committed
update clickhouse-keeper manifests, update clickhouse image to clickhouse/clickhouse-server:22.3, update backup clickhouse-backup:1.3.1, zookeeper:3.8.0 (acm not affected), tests passed add test_clickhouse_keeper to XFail ClickHouse/ClickHouse#35464, ClickHouse/ClickHouse#3546 
1 parent cecb54a commit d00317f

File tree

110 files changed

+289
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+289
-327
lines changed

‎config/templates.d/001-templates.json.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"containers" : [
3030
{
3131
"name": "clickhouse",
32-
"image": "yandex/clickhouse-server:21.3",
32+
"image": "clickhouse/clickhouse-server:22.3",
3333
"ports": [
3434
{
3535
"name": "http",

‎deploy/builder/templates-config/templates.d/001-templates.json.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"containers" : [
3030
{
3131
"name": "clickhouse",
32-
"image": "yandex/clickhouse-server:21.3",
32+
"image": "clickhouse/clickhouse-server:22.3",
3333
"ports": [
3434
{
3535
"name": "http",

‎deploy/clickhouse-keeper/clickhouse-keeper-1-node-256M-for-test-only.yaml

+18-34
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ spec:
3939
apiVersion: v1
4040
kind: Service
4141
metadata:
42-
# DNS would be like keeper-0.clickhouse-keepers.namespace.svc
42+
# DNS would be like clickhouse-keeper-0.clickhouse-keepers.namespace.svc
4343
name: clickhouse-keepers
4444
labels:
4545
app: clickhouse-keeper
4646
spec:
4747
ports:
48-
- port: 9234
48+
- port: 9444
4949
name: raft
5050
clusterIP: None
5151
selector:
@@ -80,9 +80,10 @@ data:
8080
<keeper_server incl="keeper_server">
8181
<path>/var/lib/clickhouse-keeper</path>
8282
<tcp_port>2181</tcp_port>
83+
<four_letter_word_white_list>*</four_letter_word_white_list>
8384
<coordination_settings>
8485
<!-- <raft_logs_level>trace</raft_logs_level> -->
85-
<raft_logs_level>debug</raft_logs_level>
86+
<raft_logs_level>information</raft_logs_level>
8687
</coordination_settings>
8788
</keeper_server>
8889
</yandex>
@@ -134,7 +135,7 @@ spec:
134135
path: keeper_config.xml
135136
containers:
136137
- name: clickhouse-keeper
137-
imagePullPolicy: IfNotPresent
138+
imagePullPolicy: Always
138139
image: "clickhouse/clickhouse-server:latest"
139140
resources:
140141
requests:
@@ -152,7 +153,7 @@ spec:
152153
- name: SERVERS
153154
value: "1"
154155
- name: RAFT_PORT
155-
value: "9234"
156+
value: "9444"
156157
command:
157158
- bash
158159
- -x
@@ -178,38 +179,20 @@ spec:
178179
done
179180
echo "</raft_configuration>"
180181
echo "</keeper_server></yandex>"
181-
} >> /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
182+
} > /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
182183
cat /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
183184
clickhouse keeper --config-file=/etc/clickhouse-keeper/keeper_config.xml
184185
readinessProbe:
185-
exec:
186-
command:
187-
- bash
188-
- -xc
189-
- "OK=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"ruok\" >&3 && timeout 5 cat <&3');
190-
if [[ \"$OK\" == \"imok\" ]];
191-
then
192-
STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_server_state | cut -d \" \" -f 2);
193-
if [[ \"$STATE\" == \"leader\" ]]; then
194-
SYNCED_FOLLOWERS=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_synced_followers | cut -d \" \" -f 2 | cut -d \".\" -f 1);
195-
if [[ $SYNCED_FOLLOWERS == $(( $SERVERS - 1 )) ]]; then
196-
exit 0;
197-
else
198-
exit 1;
199-
fi;
200-
elif [[ \"$STATE\" == \"follower\" ]]; then
201-
PEER_STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_peer_state);
202-
if [[ \"$PEER_STATE\" == \"following - broadcast\" ]]; then
203-
exit 0;
204-
else
205-
exit 1;
206-
fi;
207-
fi;
208-
else
209-
exit 1;
210-
fi"
211-
initialDelaySeconds: 15
212-
timeoutSeconds: 15
186+
tcpSocket:
187+
port: 9444
188+
timeoutSeconds: 5
189+
periodSeconds: 60
190+
failureThreshold: 3
191+
livenessProbe:
192+
tcpSocket:
193+
port: 2181
194+
timeoutSeconds: 5
195+
periodSeconds: 30
213196
- name: zookeeper-exporter
214197
imagePullPolicy: IfNotPresent
215198
image: dabealu/zookeeper-exporter:latest
@@ -232,6 +215,7 @@ spec:
232215
- sh
233216
- -c
234217
- "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
218+
periodSeconds: 5
235219
ports:
236220
- containerPort: 7000
237221
name: prometheus

‎deploy/clickhouse-keeper/clickhouse-keeper-1-node.yaml

+17-33
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ spec:
2121
apiVersion: v1
2222
kind: Service
2323
metadata:
24-
# DNS would be like keeper-0.clickhouse-keepers.namespace.svc
24+
# DNS would be like clickhouse-keeper-0.clickhouse-keepers.namespace.svc
2525
name: clickhouse-keepers
2626
labels:
2727
app: clickhouse-keeper
2828
spec:
2929
ports:
30-
- port: 9234
30+
- port: 9444
3131
name: raft
3232
clusterIP: None
3333
selector:
@@ -62,9 +62,10 @@ data:
6262
<keeper_server incl="keeper_server">
6363
<path>/var/lib/clickhouse-keeper</path>
6464
<tcp_port>2181</tcp_port>
65+
<four_letter_word_white_list>*</four_letter_word_white_list>
6566
<coordination_settings>
6667
<!-- <raft_logs_level>trace</raft_logs_level> -->
67-
<raft_logs_level>debug</raft_logs_level>
68+
<raft_logs_level>information</raft_logs_level>
6869
</coordination_settings>
6970
</keeper_server>
7071
</yandex>
@@ -133,7 +134,7 @@ spec:
133134
- name: SERVERS
134135
value: "1"
135136
- name: RAFT_PORT
136-
value: "9234"
137+
value: "9444"
137138
command:
138139
- bash
139140
- -x
@@ -159,38 +160,20 @@ spec:
159160
done
160161
echo "</raft_configuration>"
161162
echo "</keeper_server></yandex>"
162-
} >> /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
163+
} > /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
163164
cat /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
164165
clickhouse keeper --config-file=/etc/clickhouse-keeper/keeper_config.xml
165166
readinessProbe:
166-
exec:
167-
command:
168-
- bash
169-
- -xc
170-
- "OK=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"ruok\" >&3 && timeout 5 cat <&3');
171-
if [[ \"$OK\" == \"imok\" ]];
172-
then
173-
STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_server_state | cut -d \" \" -f 2);
174-
if [[ \"$STATE\" == \"leader\" ]]; then
175-
SYNCED_FOLLOWERS=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_synced_followers | cut -d \" \" -f 2 | cut -d \".\" -f 1);
176-
if [[ $SYNCED_FOLLOWERS == $(( $SERVERS - 1 )) ]]; then
177-
exit 0;
178-
else
179-
exit 1;
180-
fi;
181-
elif [[ \"$STATE\" == \"follower\" ]]; then
182-
PEER_STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_peer_state);
183-
if [[ \"$PEER_STATE\" == \"following - broadcast\" ]]; then
184-
exit 0;
185-
else
186-
exit 1;
187-
fi;
188-
fi;
189-
else
190-
exit 1;
191-
fi"
192-
initialDelaySeconds: 15
193-
timeoutSeconds: 15
167+
tcpSocket:
168+
port: 9444
169+
timeoutSeconds: 5
170+
periodSeconds: 60
171+
failureThreshold: 3
172+
livenessProbe:
173+
tcpSocket:
174+
port: 2181
175+
timeoutSeconds: 5
176+
periodSeconds: 30
194177
- name: zookeeper-exporter
195178
imagePullPolicy: IfNotPresent
196179
image: dabealu/zookeeper-exporter:latest
@@ -213,6 +196,7 @@ spec:
213196
- sh
214197
- -c
215198
- "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
199+
periodSeconds: 5
216200
ports:
217201
- containerPort: 7000
218202
name: prometheus

‎deploy/clickhouse-keeper/clickhouse-keeper-3-nodes-256M-for-test-only.yaml

+18-34
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ spec:
3939
apiVersion: v1
4040
kind: Service
4141
metadata:
42-
# DNS would be like keeper-0.clickhouse-keepers.namespace.svc
42+
# DNS would be like clickhouse-keeper-0.clickhouse-keepers.namespace.svc
4343
name: clickhouse-keepers
4444
labels:
4545
app: clickhouse-keeper
4646
spec:
4747
ports:
48-
- port: 9234
48+
- port: 9444
4949
name: raft
5050
clusterIP: None
5151
selector:
@@ -80,9 +80,10 @@ data:
8080
<keeper_server incl="keeper_server">
8181
<path>/var/lib/clickhouse-keeper</path>
8282
<tcp_port>2181</tcp_port>
83+
<four_letter_word_white_list>*</four_letter_word_white_list>
8384
<coordination_settings>
8485
<!-- <raft_logs_level>trace</raft_logs_level> -->
85-
<raft_logs_level>debug</raft_logs_level>
86+
<raft_logs_level>information</raft_logs_level>
8687
</coordination_settings>
8788
</keeper_server>
8889
</yandex>
@@ -134,7 +135,7 @@ spec:
134135
path: keeper_config.xml
135136
containers:
136137
- name: clickhouse-keeper
137-
imagePullPolicy: IfNotPresent
138+
imagePullPolicy: Always
138139
image: "clickhouse/clickhouse-server:latest"
139140
resources:
140141
requests:
@@ -152,7 +153,7 @@ spec:
152153
- name: SERVERS
153154
value: "3"
154155
- name: RAFT_PORT
155-
value: "9234"
156+
value: "9444"
156157
command:
157158
- bash
158159
- -x
@@ -178,38 +179,20 @@ spec:
178179
done
179180
echo "</raft_configuration>"
180181
echo "</keeper_server></yandex>"
181-
} >> /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
182+
} > /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
182183
cat /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
183184
clickhouse keeper --config-file=/etc/clickhouse-keeper/keeper_config.xml
184185
readinessProbe:
185-
exec:
186-
command:
187-
- bash
188-
- -xc
189-
- "OK=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"ruok\" >&3 && timeout 5 cat <&3');
190-
if [[ \"$OK\" == \"imok\" ]];
191-
then
192-
STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_server_state | cut -d \" \" -f 2);
193-
if [[ \"$STATE\" == \"leader\" ]]; then
194-
SYNCED_FOLLOWERS=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_synced_followers | cut -d \" \" -f 2 | cut -d \".\" -f 1);
195-
if [[ $SYNCED_FOLLOWERS == $(( $SERVERS - 1 )) ]]; then
196-
exit 0;
197-
else
198-
exit 1;
199-
fi;
200-
elif [[ \"$STATE\" == \"follower\" ]]; then
201-
PEER_STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_peer_state);
202-
if [[ \"$PEER_STATE\" == \"following - broadcast\" ]]; then
203-
exit 0;
204-
else
205-
exit 1;
206-
fi;
207-
fi;
208-
else
209-
exit 1;
210-
fi"
211-
initialDelaySeconds: 15
212-
timeoutSeconds: 15
186+
tcpSocket:
187+
port: 9444
188+
timeoutSeconds: 5
189+
periodSeconds: 60
190+
failureThreshold: 3
191+
livenessProbe:
192+
tcpSocket:
193+
port: 2181
194+
timeoutSeconds: 5
195+
periodSeconds: 30
213196
- name: zookeeper-exporter
214197
imagePullPolicy: IfNotPresent
215198
image: dabealu/zookeeper-exporter:latest
@@ -232,6 +215,7 @@ spec:
232215
- sh
233216
- -c
234217
- "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
218+
periodSeconds: 5
235219
ports:
236220
- containerPort: 7000
237221
name: prometheus

0 commit comments

Comments
 (0)