Skip to content

Commit 0a357c8

Browse files
authored
tests: support cloud-engine next gen startup (pingcap#4661)
close pingcap#4660
1 parent e9fe8ad commit 0a357c8

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

tests/integration_tests/_utils/start_tidb_cluster_nextgen

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ if [ -z "$OUT_DIR" ]; then
9595
exit 1
9696
fi
9797

98+
echo "Checking TiKV version information..."
99+
tikv-server -V
100+
98101
# start minio
99102
echo "Starting MinIO server..."
100103
mkdir -p "$TEST_DATA_DIR/minio"
@@ -220,6 +223,9 @@ wal-sync-dir = "$TEST_DATA_DIR/wal-sync/upstream/tikv/raft-wal"
220223
lightweight-backup = true
221224
target-file-size = "512MB"
222225
wal-chunk-target-file-size = "128MB"
226+
227+
[cdc]
228+
enable = true
223229
EOF
224230

225231
touch "$OUT_DIR/downstream-tikv.toml"
@@ -244,12 +250,14 @@ wal-sync-dir = "$TEST_DATA_DIR/wal-sync/downstream/tikv/raft-wal"
244250
lightweight-backup = true
245251
target-file-size = "512MB"
246252
wal-chunk-target-file-size = "128MB"
253+
254+
[cdc]
255+
enable = true
247256
EOF
248257

249258
echo "Starting upstream TiKV..."
250259
mkdir -p "$TEST_DATA_DIR/upstream"
251260
mkdir -p "$OUT_DIR/log/upstream/tikv"
252-
tikv-server --version
253261
for idx in $(seq 1 3); do
254262
host="UP_TIKV_HOST_$idx"
255263
port="UP_TIKV_PORT_$idx"
@@ -269,7 +277,6 @@ done
269277
echo "Starting downstream TiKV..."
270278
mkdir -p "$TEST_DATA_DIR/downstream"
271279
mkdir -p "$OUT_DIR/log/downstream/tikv"
272-
tikv-server --version
273280
tikv-server \
274281
--pd "${DOWN_PD_HOST}:${DOWN_PD_PORT}" \
275282
-A "${DOWN_TIKV_HOST}:${DOWN_TIKV_PORT}" \

tests/integration_tests/_utils/start_tls_tidb_cluster_impl_nextgen

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ else
6868
echo "Bucket tls-cse-test already exists, skipping creation"
6969
fi
7070

71+
echo "Checking TiKV version information..."
72+
tikv-server -V
73+
7174
# Tries to limit the max number of open files under the system limit
7275
cat - >"$OUT_DIR/tikv-config-tls.toml" <<EOF
7376
[storage]
@@ -92,6 +95,9 @@ wal-chunk-target-file-size = "128MB"
9295
ca-path = "$TLS_DIR/ca.pem"
9396
cert-path = "$TLS_DIR/server.pem"
9497
key-path = "$TLS_DIR/server-key.pem"
98+
99+
[cdc]
100+
enable = true
95101
EOF
96102

97103
cat >"$OUT_DIR/tikv-worker-tls.toml" <<EOF
@@ -176,7 +182,6 @@ cluster-ssl-key = "$TLS_DIR/server-key.pem"
176182
EOF
177183

178184
echo "Starting TLS TiKV..."
179-
tikv-server --version
180185
# Uncomment to turn on grpc versbose log.
181186
# GRPC_VERBOSITY=debug \
182187
# GRPC_TRACE=server_channel,call_error,handshaker,tsi \

0 commit comments

Comments
 (0)