Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

pingcap · Dec 20, 2021 · 472f94a · 472f94a
2 parents 2c9a23b + e1a3eb1
commit 472f94a
Show file tree

Hide file tree

Showing 50 changed files with 139 additions and 57 deletions.
diff --git a/pkg/util/tz.go b/pkg/util/tz.go
@@ -14,11 +14,11 @@
 package util
 
 import (
- "os"
  "path/filepath"
  "strings"
  "time"
 
+ "github.com/pingcap/tidb/util/timeutil"
  cerror "github.com/pingcap/tiflow/pkg/errors"
 )
 
@@ -57,9 +57,6 @@ func GetLocalTimezone() (*time.Location, error) {
  if time.Local.String() != "Local" {
  return time.Local, nil
  }
- str, err := os.Readlink("/etc/localtime")
- if err != nil {
- return nil, cerror.WrapError(cerror.ErrLoadTimezone, err)
- }
+ str := timeutil.InferSystemTZ()
  return getTimezoneFromZonefile(str)
 }
diff --git a/tests/integration_tests/_utils/check_sync_diff b/tests/integration_tests/_utils/check_sync_diff
@@ -14,14 +14,13 @@ binary=sync_diff_inspector
 
 PWD=$(pwd)
 LOG=$workdir/sync_diff_inspector.log
-OUTPUT_DIR=/tmp/ticdc_dm_test/output/
 
 mkdir -p /tmp/ticdc_dm_test
 
 cd $workdir
 i=0
 while [ $i -lt $check_time ]; do
- rm -rf $OUTPUT_DIR
+ rm -rf $workdir/sync_diff/
  $binary --config=$conf >>$LOG 2>&1
  ret=$?
  if [ "$ret" == 0 ]; then
@@ -38,7 +37,7 @@ if [ $i -ge $check_time ]; then
  # show \n and other blanks
  cat $LOG
  printf "\n"
- cat $OUTPUT_DIR/sync_diff.log
+ cat $workdir/sync_diff/output/sync_diff.log
  printf "\n"
  exit 1
 fi

diff --git a/tests/integration_tests/autorandom/conf/diff_config.toml b/tests/integration_tests/autorandom/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/autorandom/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/batch_add_table/conf/diff_config.toml b/tests/integration_tests/batch_add_table/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/batch_add_table/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/capture_session_done_during_task/conf/diff_config.toml b/tests/integration_tests/capture_session_done_during_task/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/capture_session_done_during_task/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/capture_suicide_while_balance_table/conf/diff_config.toml b/tests/integration_tests/capture_suicide_while_balance_table/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/capture_suicide_while_balance_table/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/changefeed_auto_stop/conf/diff_config.toml b/tests/integration_tests/changefeed_auto_stop/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/changefeed_auto_stop/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/changefeed_error/conf/diff_config.toml b/tests/integration_tests/changefeed_error/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/changefeed_error/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/changefeed_finish/conf/diff_config.toml b/tests/integration_tests/changefeed_finish/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/changefeed_finish/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/changefeed_pause_resume/conf/diff_config.toml b/tests/integration_tests/changefeed_pause_resume/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/changefeed_pause_resume/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/changefeed_reconstruct/conf/diff_config.toml b/tests/integration_tests/changefeed_reconstruct/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/changefeed_reconstruct/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/clustered_index/conf/diff_config.toml b/tests/integration_tests/clustered_index/conf/diff_config.toml
@@ -0,0 +1,29 @@
+# diff Configuration.
+
+check-thread-count = 4
+
+export-fix-sql = true
+
+check-struct-only = false
+
+[task]
+ output-dir = "/tmp/tidb_cdc_test/clustered_index/sync_diff/output"
+
+ source-instances = ["mysql1"]
+
+ target-instance = "tidb0"
+
+ target-check-tables = ["clustered_index_test.?*"]
+
+[data-sources]
+[data-sources.mysql1]
+ host = "127.0.0.1"
+ port = 4000
+ user = "root"
+ password = ""
+
+[data-sources.tidb0]
+ host = "127.0.0.1"
+ port = 3306
+ user = "root"
+ password = ""
diff --git a/tests/integration_tests/common_1/conf/diff_config.toml b/tests/integration_tests/common_1/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/common_1/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/consistent_replicate_nfs/conf/diff_config.toml b/tests/integration_tests/consistent_replicate_nfs/conf/diff_config.toml
@@ -0,0 +1,29 @@
+# diff Configuration.
+
+check-thread-count = 4
+
+export-fix-sql = true
+
+check-struct-only = false
+
+[task]
+ output-dir = "/tmp/tidb_cdc_test/consistent_replicate_nfs/sync_diff/output"
+
+ source-instances = ["mysql1"]
+
+ target-instance = "tidb0"
+
+ target-check-tables = ["consistent_replicate_nfs.usertable*"]
+
+[data-sources]
+[data-sources.mysql1]
+ host = "127.0.0.1"
+ port = 4000
+ user = "root"
+ password = ""
+
+[data-sources.tidb0]
+ host = "127.0.0.1"
+ port = 3306
+ user = "root"
+ password = ""
diff --git a/tests/integration_tests/consistent_replicate_s3/conf/diff_config.toml b/tests/integration_tests/consistent_replicate_s3/conf/diff_config.toml
@@ -0,0 +1,29 @@
+# diff Configuration.
+
+check-thread-count = 4
+
+export-fix-sql = true
+
+check-struct-only = false
+
+[task]
+ output-dir = "/tmp/tidb_cdc_test/consistent_replicate_s3/sync_diff/output"
+
+ source-instances = ["mysql1"]
+
+ target-instance = "tidb0"
+
+ target-check-tables = ["consistent_replicate_s3.usertable*"]
+
+[data-sources]
+[data-sources.mysql1]
+ host = "127.0.0.1"
+ port = 4000
+ user = "root"
+ password = ""
+
+[data-sources.tidb0]
+ host = "127.0.0.1"
+ port = 3306
+ user = "root"
+ password = ""
diff --git a/tests/integration_tests/cyclic_ab/conf/diff_config.toml b/tests/integration_tests/cyclic_ab/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/cyclic_ab/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/cyclic_abc/conf/diff_config_down_tls.toml b/tests/integration_tests/cyclic_abc/conf/diff_config_down_tls.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/cyclic_abc/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/cyclic_abc/conf/diff_config_up_down.toml b/tests/integration_tests/cyclic_abc/conf/diff_config_up_down.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/cyclic_abc/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/ddl_async/conf/diff_config.toml b/tests/integration_tests/ddl_async/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/ddl_attributes/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/ddl_reentrant/conf/diff_config.toml b/tests/integration_tests/ddl_reentrant/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/ddl_reentrant/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/ddl_sequence/conf/diff_config.toml b/tests/integration_tests/ddl_sequence/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/ddl_sequence/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/drop_many_tables/conf/diff_config.toml b/tests/integration_tests/drop_many_tables/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/drop_many_tables/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/gc_safepoint/conf/diff_config.toml b/tests/integration_tests/gc_safepoint/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/gc_safepoint/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/generate_column/conf/diff_config.toml b/tests/integration_tests/generate_column/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/generate_column/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/kafka_messages/conf/diff_config.toml b/tests/integration_tests/kafka_messages/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/kafka_message/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/kafka_sink_error_resume/conf/diff_config.toml b/tests/integration_tests/kafka_sink_error_resume/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/kafka_sink_error_resume/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/kill_owner_with_ddl/conf/diff_config.toml b/tests/integration_tests/kill_owner_with_ddl/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/kill_owner_with_ddl/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/kv_client_stream_reconnect/conf/diff_config.toml b/tests/integration_tests/kv_client_stream_reconnect/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/kv_client_stream_reconnect/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/many_pk_or_uk/diff_config.toml b/tests/integration_tests/many_pk_or_uk/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/many_pk_or_uk/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/move_table/conf/diff_config.toml b/tests/integration_tests/move_table/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/move_table/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/multi_capture/conf/diff_config.toml b/tests/integration_tests/multi_capture/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/multi_capture/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/multi_source/diff_config.toml b/tests/integration_tests/multi_source/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/multi_source/sync_diff/output"
 
  source-instances = ["mysql1"]
 

diff --git a/tests/integration_tests/new_ci_collation_with_old_value/conf/diff_config.toml b/tests/integration_tests/new_ci_collation_with_old_value/conf/diff_config.toml
@@ -7,7 +7,7 @@ export-fix-sql = true
 check-struct-only = false
 
 [task]
- output-dir = "/tmp/ticdc_dm_test/output"
+ output-dir = "/tmp/tidb_cdc_test/new_ci_collation_with_old_value/sync_diff/output"
 
  source-instances = ["mysql1"]