test: enable tls test for DM (#10414)

close #10413

Author: lance6716

dm/master/config.go

@@ -450,7 +450,7 @@ func genEmbedEtcdConfigWithLogger(logLevel string) *embed.Config {
 	cfg := embed.NewConfig()
 	// disable grpc gateway because https://github.com/etcd-io/etcd/issues/12713
 	// TODO: wait above issue fixed
-	// cfg.EnableGRPCGateway = true // enable gRPC gateway for the internal etcd.
+	cfg.EnableGRPCGateway = false // enable gRPC gateway for the internal etcd.
 
 	// use zap as the logger for embed etcd
 	// NOTE: `genEmbedEtcdConfig` can only be called after logger initialized.

dm/tests/tls/run.sh

@@ -292,6 +292,11 @@ function test_master_ha_when_enable_tidb_and_only_ca_source_tls() {
 	check_rpc_alive $cur/../bin/check_master_online_http 127.0.0.1:$MASTER_PORT1 "$cur/conf/ca.pem" "$cur/conf/dm.pem" "$cur/conf/dm.key"
 	check_rpc_alive $cur/../bin/check_master_http_apis 127.0.0.1:$MASTER_PORT1 "$cur/conf/ca.pem" "$cur/conf/dm.pem" "$cur/conf/dm.key"
 
+	# https://github.com/pingcap/dm/issues/1458
+	# check the log is not repeatedly printed
+	check_log_not_contains $WORK_DIR/master1/log/dm-master.log "remote error: tls: bad certificate"
+	check_log_not_contains $WORK_DIR/master1/log/dm-master.log "client certificate authentication failed"
+
 	echo "use common name not in 'cert-allowed-cn' should not request success"
 	check_rpc_alive $cur/../bin/check_master_online_http 127.0.0.1:$MASTER_PORT1 "$cur/conf/ca.pem" "$cur/conf/other.pem" "$cur/conf/other.key" && exit 1 || true
 
@@ -307,10 +312,6 @@ function test_master_ha_when_enable_tidb_and_only_ca_source_tls() {
 	echo "check data"
 	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
-	# https://github.com/pingcap/dm/issues/1458
-	# check the log is not repeatedly printed
-	check_log_contains $WORK_DIR/master1/log/dm-master.log "remote error: tls: bad certificate" 1
-
 	echo "============================== test_master_ha_when_enable_tidb_and_only_ca_source_tls success =================================="
 }
 
@@ -384,17 +385,17 @@ function run() {
 	test_source_and_target_with_empty_tlsconfig
 }
 
-#cleanup_data tls
-#cleanup_process
-#
-#run
-#
-## kill the tidb with tls
-#pkill -hup tidb-server 2>/dev/null || true
-#wait_process_exit tidb-server
-#
-#run_tidb_server 4000 $TIDB_PASSWORD
-#
-#cleanup_process
+cleanup_data tls
+cleanup_process
+
+run
+
+# kill the tidb with tls
+pkill -hup tidb-server 2>/dev/null || true
+wait_process_exit tidb-server
+
+run_tidb_server 4000 $TIDB_PASSWORD
+
+cleanup_process
 
 echo "[$(date)] <<<<<< test case $TEST_NAME success! >>>>>>"