From fe9e08a341c80df50bff1019e0b6bc5cee5fdd71 Mon Sep 17 00:00:00 2001 From: luancheng Date: Wed, 4 Mar 2020 18:25:39 +0800 Subject: [PATCH 01/15] tests: add e2e test --- fix.sql | 0 tests/_utils/check_sync_diff | 34 +++++++++++++++ tests/_utils/run_lightning | 9 ++++ tests/_utils/run_services | 73 +++++++++++++++++++++++++++++++++ tests/e2e/conf/diff_config.toml | 42 +++++++++++++++++++ tests/e2e/conf/lightning.toml | 22 ++++++++++ tests/e2e/run.sh | 37 +++++++++++++++++ tests/run.sh | 40 +++++++----------- 8 files changed, 232 insertions(+), 25 deletions(-) create mode 100644 fix.sql create mode 100755 tests/_utils/check_sync_diff create mode 100755 tests/_utils/run_lightning create mode 100755 tests/_utils/run_services create mode 100644 tests/e2e/conf/diff_config.toml create mode 100644 tests/e2e/conf/lightning.toml create mode 100644 tests/e2e/run.sh diff --git a/fix.sql b/fix.sql new file mode 100644 index 00000000..e69de29b diff --git a/tests/_utils/check_sync_diff b/tests/_utils/check_sync_diff new file mode 100755 index 00000000..8c4e97e9 --- /dev/null +++ b/tests/_utils/check_sync_diff @@ -0,0 +1,34 @@ +#!/bin/bash +# parameter 1: config file for sync_diff_inspector +# parameter 2: max check times + +conf=$1 +if [ $# -ge 2 ]; then + check_time=$2 +else + check_time=10 +fi + +LOG=$DUMPLING_OUTPUT_DIR/sync_diff_inspector.log + +i=0 +while [ $i -lt $check_time ] +do + bin/sync_diff_inspector --config=$conf >> $LOG 2>&1 + ret=$? + if [ "$ret" == 0 ]; then + echo "check diff successfully" + break + fi + ((i++)) + echo "check diff failed $i-th time, retry later" + sleep 2 +done + +if [ $i -ge $check_time ]; then + echo "check diff failed at last" + # show \n and other blanks + printf "$(cat $LOG)\n" + exit 1 +fi +cd $PWD diff --git a/tests/_utils/run_lightning b/tests/_utils/run_lightning new file mode 100755 index 00000000..339ba23b --- /dev/null +++ b/tests/_utils/run_lightning @@ -0,0 +1,9 @@ +#!/bin/sh + +set -eu + +echo "[$(date)] Executing bin/tidb-lightning..." + +conf=$1 + +bin/tidb-lightning -c $1 diff --git a/tests/_utils/run_services b/tests/_utils/run_services new file mode 100755 index 00000000..f7ec460b --- /dev/null +++ b/tests/_utils/run_services @@ -0,0 +1,73 @@ +#!/bin/sh + +set -eu + +PD_ADDR="127.0.0.1:2379" +TIDB_IP="127.0.0.1" +TIDB_PORT="4000" +TIDB_ADDR="127.0.0.1:4000" +TIDB_STATUS_ADDR="127.0.0.1:10080" + +stop_services() { + killall -9 tidb-server || true + killall -9 pd-server || true + + find "$DUMPLING_TEST_DIR" -maxdepth 1 -not -path "$DUMPLING_TEST_DIR" -not -name "*.log" | xargs rm -r || true +} + +start_services() { + stop_services + echo "Ensure mysql can connected..." + +cat > "$DUMPLING_TEST_DIR/mysql.cnf" < /dev/null; do + i=$((i+1)) + if [ "$i" -gt 10 ]; then + echo 'Failed to ping MySQL Server' + exit 1 + fi + sleep 3 + done + + echo "Starting PD..." + bin/pd-server \ + --client-urls "http://$PD_ADDR" \ + --log-file "$DUMPLING_TEST_DIR/pd.log" \ + --data-dir "$DUMPLING_TEST_DIR/pd" & + # wait until PD is online... + i=0 + while ! curl -o /dev/null -sf "http://$PD_ADDR/pd/api/v1/version"; do + i=$((i+1)) + if [ "$i" -gt 10 ]; then + echo 'Failed to start PD' + exit 1 + fi + sleep 3 + done + + bin/tidb-server \ + -P 4000 \ + --status 10080 \ + --store mocktikv \ + --log-file "$DUMPLING_TEST_DIR/tidb.log" & + + echo "Verifying TiDB is started..." + i=0 + while ! curl -o /dev/null -sf "http://$TIDB_IP:10080/status"; do + i=$((i+1)) + if [ "$i" -gt 10 ]; then + echo 'Failed to start TiDB' + exit 1 + fi + sleep 3 + done +} + diff --git a/tests/e2e/conf/diff_config.toml b/tests/e2e/conf/diff_config.toml new file mode 100644 index 00000000..7c698b6a --- /dev/null +++ b/tests/e2e/conf/diff_config.toml @@ -0,0 +1,42 @@ +# diff Configuration. + +log-level = "info" + +chunk-size = 1000 + +check-thread-count = 4 + +sample-percent = 100 + +use-rowid = false + +use-checksum = true + +fix-sql-file = "fix.sql" + +# tables need to check. +[[check-tables]] +schema = "e2e" +tables = ["~t.*"] + +[[table-config]] +schema = "e2e" +table = "t" + +[[table-config.source-tables]] +instance-id = "source-1" +schema = "e2e" +table = "t" + +[[source-db]] +host = "127.0.0.1" +port = 3306 +user = "root" +password = "" +instance-id = "source-1" + +[target-db] +host = "127.0.0.1" +port = 4000 +user = "root" +password = "" diff --git a/tests/e2e/conf/lightning.toml b/tests/e2e/conf/lightning.toml new file mode 100644 index 00000000..9f47b4a0 --- /dev/null +++ b/tests/e2e/conf/lightning.toml @@ -0,0 +1,22 @@ +### tidb-lightning config + +[lightning] +server-mode = false +level = "error" +check-requirements = false +file = "/tmp/dumpling_test_result/tidb-lightning.log" + +[tikv-importer] +backend="tidb" +on-duplicate = "error" + +[mydumper] +data-source-dir = "/tmp/dumpling_test_result/sql_res.e2e" + +[tidb] +host = "127.0.0.1" +port = 4000 +user = "root" +password = "" +status-port = 10080 +pd-addr = "127.0.0.1:2379" diff --git a/tests/e2e/run.sh b/tests/e2e/run.sh new file mode 100644 index 00000000..e50b6e99 --- /dev/null +++ b/tests/e2e/run.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +set -eu +cur=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) + +DB_NAME="e2e" +TABLE_NAME="t" + +# drop database on tidb +export DUMPLING_TEST_PORT=4000 +run_sql "drop database if exists $DB_NAME;" + +# drop database on mysql +export DUMPLING_TEST_PORT=3306 +run_sql "drop database if exists $DB_NAME;" + +# build data on mysql +run_sql "create database $DB_NAME;" +run_sql "create table $DB_NAME.$TABLE_NAME (a int(255));" + +# insert 100 records +i=0; while [ $i -lt 100 ]; do + run_sql "insert into $DB_NAME.$TABLE_NAME values (\"$i\");" + i=$(( i + 1 )) +done + +# dumping +export DUMPLING_TEST_DATABASE=$DB_NAME +run_dumpling + +# use lightning import data to tidb +run_lightning $cur/conf/lightning.toml + +# check mysql and tidb data +check_sync_diff $cur/conf/diff_config.toml + + diff --git a/tests/run.sh b/tests/run.sh index ce921d02..17d608f0 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -20,29 +20,18 @@ set -eu mkdir -p "$DUMPLING_TEST_DIR" PATH="tests/_utils:$PATH" +cur=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source $cur/_utils/run_services -cat > "$DUMPLING_TEST_DIR/mysql.cnf" < /dev/null; do - i=$((i+1)) - if [ "$i" -gt 5 ]; then - echo 'Failed to ping MySQL Server' - exit 1 - fi - sleep 3 - done -} - -test_connection + +file_should_exist bin/pd-server +file_should_exist bin/tidb-server +file_should_exist bin/tidb-lightning +file_should_exist bin/dumpling +file_should_exist bin/sync_diff_inspector + +trap stop_services EXIT +start_services for script in tests/*/run.sh; do echo "****************** Running test $script..." @@ -52,11 +41,12 @@ for script in tests/*/run.sh; do DUMPLING_OUTPUT_DIR="$DUMPLING_TEST_DIR"/sql_res."$TEST_NAME" export DUMPLING_OUTPUT_DIR - echo "Cleaning up test output dir: $DUMPLING_OUTPUT_DIR" - rm "$DUMPLING_OUTPUT_DIR" -rf - PATH="tests/_utils:$PATH" \ sh "$script" + + echo "Cleaning up test output dir: $DUMPLING_OUTPUT_DIR" + rm -rf "$DUMPLING_OUTPUT_DIR" + done echo "Passed integration tests." From 5f72f07777a65efae2a29ddbdd0978ead9677e13 Mon Sep 17 00:00:00 2001 From: luancheng Date: Wed, 4 Mar 2020 19:09:56 +0800 Subject: [PATCH 02/15] fix ci --- tests/run.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 17d608f0..269b6e81 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -20,8 +20,7 @@ set -eu mkdir -p "$DUMPLING_TEST_DIR" PATH="tests/_utils:$PATH" -cur=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source $cur/_utils/run_services +. "tests/_utils/run_services" file_should_exist bin/pd-server From 44e2413f0cf245160ba23d4c3bfb619c4eafa71d Mon Sep 17 00:00:00 2001 From: 3pointer Date: Wed, 4 Mar 2020 19:39:36 +0800 Subject: [PATCH 03/15] Update tests/_utils/check_sync_diff Co-Authored-By: kennytm --- tests/_utils/check_sync_diff | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/_utils/check_sync_diff b/tests/_utils/check_sync_diff index 8c4e97e9..dcf51f53 100755 --- a/tests/_utils/check_sync_diff +++ b/tests/_utils/check_sync_diff @@ -3,11 +3,7 @@ # parameter 2: max check times conf=$1 -if [ $# -ge 2 ]; then - check_time=$2 -else - check_time=10 -fi +check_time=${2-10} LOG=$DUMPLING_OUTPUT_DIR/sync_diff_inspector.log From 00e4a0da759d8cb621da714c80e57f5ef6fbb4cb Mon Sep 17 00:00:00 2001 From: luancheng Date: Thu, 5 Mar 2020 17:25:00 +0800 Subject: [PATCH 04/15] fix ci --- .travis.yml | 3 +++ install.sh | 26 ++++++++++++++++++++++++++ tests/e2e/run.sh | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 install.sh diff --git a/.travis.yml b/.travis.yml index b9002898..7915ac39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ dist: bionic go: - 1.13.x +install: + - sh install.sh + script: - make test WITH_RACE=1 - make integration_test diff --git a/install.sh b/install.sh new file mode 100644 index 00000000..ab7f0919 --- /dev/null +++ b/install.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +TAG="v4.0.0-beta.1" +pwd=$(pwd) + +mkdir bin/ + +# download lightning and sync_diff_inspector +wget http://download.pingcap.org/tidb-toolkit-$TAG-linux-amd64.tar.gz -O tools.tar.gz +tar -xzvf tools.tar.gz +mv tidb-toolkit-$TAG-linux-amd64/bin/* bin/ + + +# download pd-server +git clone -b $TAG https://github.com/pingcap/pd +cd $pwd/pd && make +cd $pwd +mv pd/bin/pd-server bin/ + +# download tidb-server +git clone -b $TAG https://github.com/pingcap/tidb +cd $pwd/tidb && make +cd $pwd +mv tidb/bin/tidb-server bin/ diff --git a/tests/e2e/run.sh b/tests/e2e/run.sh index e50b6e99..c5d6952f 100644 --- a/tests/e2e/run.sh +++ b/tests/e2e/run.sh @@ -1,7 +1,7 @@ #!/bin/sh set -eu -cur=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +cur=$(cd `dirname $0`; pwd) DB_NAME="e2e" TABLE_NAME="t" From ae754e4bec75645aa3ae8b2886687173c8b8d957 Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 20:15:16 +0800 Subject: [PATCH 05/15] fix ci --- .gitignore | 1 + tests/e2e/run.sh | 5 +---- tests/file_size/run.sh | 2 +- tests/views/run.sh | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 179915a7..04637f08 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ bin/ coverage.txt .idea var +fix.sql diff --git a/tests/e2e/run.sh b/tests/e2e/run.sh index c5d6952f..60fe5851 100644 --- a/tests/e2e/run.sh +++ b/tests/e2e/run.sh @@ -19,10 +19,7 @@ run_sql "create database $DB_NAME;" run_sql "create table $DB_NAME.$TABLE_NAME (a int(255));" # insert 100 records -i=0; while [ $i -lt 100 ]; do - run_sql "insert into $DB_NAME.$TABLE_NAME values (\"$i\");" - i=$(( i + 1 )) -done +run_sql "insert into $DB_NAME.$TABLE_NAME values $(seq -s, 99 | sed "s/[0-9]*/('1')/g");" # dumping export DUMPLING_TEST_DATABASE=$DB_NAME diff --git a/tests/file_size/run.sh b/tests/file_size/run.sh index ee52fd73..b8670605 100644 --- a/tests/file_size/run.sh +++ b/tests/file_size/run.sh @@ -10,7 +10,7 @@ run_sql "create table t (a varchar(255))" chars_20="1111_0000_1111_0000_" # insert 100 records, each occupies 20 bytes -run_sql "insert into t values $(seq -s, 100 | sed "s/[0-9]\+/('$chars_20')/g")" +run_sql "insert into t values $(seq -s, 99 | sed "s/[0-9]*/('$chars_20')/g");" # dumping with file size = 200 bytes run_dumpling -F 200 diff --git a/tests/views/run.sh b/tests/views/run.sh index 93559019..5907eff4 100644 --- a/tests/views/run.sh +++ b/tests/views/run.sh @@ -9,7 +9,7 @@ export DUMPLING_TEST_DATABASE="views" run_sql "create table t (a bigint, b varchar(255))" run_sql "create definer = 'root'@'localhost' view v as select * from t;" # insert 20 records to `t`. -run_sql "insert into t values $(seq -s, 0 19 | sed 's/[0-9]\+/(\0,"\0")/g')" +run_sql "insert into t values $(seq -s, 19 | sed 's/[0-9]*/(\0,"\0")/g')" run_dumpling --no-views file_not_exist "$DUMPLING_OUTPUT_DIR/views.v-schema.sql" From 241bef3d600fa53451fd5539d9c873601500f30b Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 20:20:28 +0800 Subject: [PATCH 06/15] remove pd-server --- install.sh | 7 ------- tests/_utils/run_services | 16 ---------------- tests/e2e/conf/lightning.toml | 1 - tests/run.sh | 1 - 4 files changed, 25 deletions(-) diff --git a/install.sh b/install.sh index ab7f0919..45641616 100644 --- a/install.sh +++ b/install.sh @@ -12,13 +12,6 @@ wget http://download.pingcap.org/tidb-toolkit-$TAG-linux-amd64.tar.gz -O tools.t tar -xzvf tools.tar.gz mv tidb-toolkit-$TAG-linux-amd64/bin/* bin/ - -# download pd-server -git clone -b $TAG https://github.com/pingcap/pd -cd $pwd/pd && make -cd $pwd -mv pd/bin/pd-server bin/ - # download tidb-server git clone -b $TAG https://github.com/pingcap/tidb cd $pwd/tidb && make diff --git a/tests/_utils/run_services b/tests/_utils/run_services index f7ec460b..96d6e73d 100755 --- a/tests/_utils/run_services +++ b/tests/_utils/run_services @@ -37,22 +37,6 @@ EOF sleep 3 done - echo "Starting PD..." - bin/pd-server \ - --client-urls "http://$PD_ADDR" \ - --log-file "$DUMPLING_TEST_DIR/pd.log" \ - --data-dir "$DUMPLING_TEST_DIR/pd" & - # wait until PD is online... - i=0 - while ! curl -o /dev/null -sf "http://$PD_ADDR/pd/api/v1/version"; do - i=$((i+1)) - if [ "$i" -gt 10 ]; then - echo 'Failed to start PD' - exit 1 - fi - sleep 3 - done - bin/tidb-server \ -P 4000 \ --status 10080 \ diff --git a/tests/e2e/conf/lightning.toml b/tests/e2e/conf/lightning.toml index 9f47b4a0..047da004 100644 --- a/tests/e2e/conf/lightning.toml +++ b/tests/e2e/conf/lightning.toml @@ -19,4 +19,3 @@ port = 4000 user = "root" password = "" status-port = 10080 -pd-addr = "127.0.0.1:2379" diff --git a/tests/run.sh b/tests/run.sh index 269b6e81..c309f016 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -23,7 +23,6 @@ PATH="tests/_utils:$PATH" . "tests/_utils/run_services" -file_should_exist bin/pd-server file_should_exist bin/tidb-server file_should_exist bin/tidb-lightning file_should_exist bin/dumpling From 51f696112bbbde1544df16c7a8d8d6e0f191828d Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 20:54:17 +0800 Subject: [PATCH 07/15] fix ci --- tests/_utils/run_services | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/_utils/run_services b/tests/_utils/run_services index 96d6e73d..1b07cda6 100755 --- a/tests/_utils/run_services +++ b/tests/_utils/run_services @@ -10,7 +10,6 @@ TIDB_STATUS_ADDR="127.0.0.1:10080" stop_services() { killall -9 tidb-server || true - killall -9 pd-server || true find "$DUMPLING_TEST_DIR" -maxdepth 1 -not -path "$DUMPLING_TEST_DIR" -not -name "*.log" | xargs rm -r || true } From 2c39281bc7a011d47c90cef3160bd6683d0f548c Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 21:05:02 +0800 Subject: [PATCH 08/15] fix ci --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 45641616..4ab673d1 100644 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ set -e -TAG="v4.0.0-beta.1" +TAG="v3.0.10" pwd=$(pwd) mkdir bin/ From 593f30ce6710c577fcdbaa70d61ea4faf6b6f349 Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 21:19:24 +0800 Subject: [PATCH 09/15] fix ci --- tests/e2e/run.sh | 2 +- tests/file_size/run.sh | 2 +- tests/views/run.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/run.sh b/tests/e2e/run.sh index 60fe5851..5499d26b 100644 --- a/tests/e2e/run.sh +++ b/tests/e2e/run.sh @@ -19,7 +19,7 @@ run_sql "create database $DB_NAME;" run_sql "create table $DB_NAME.$TABLE_NAME (a int(255));" # insert 100 records -run_sql "insert into $DB_NAME.$TABLE_NAME values $(seq -s, 99 | sed "s/[0-9]*/('1')/g");" +run_sql "insert into $DB_NAME.$TABLE_NAME values $(seq -s, 100 | sed 's/,*$//g' | sed "s/[0-9]*/('1')/g");" # dumping export DUMPLING_TEST_DATABASE=$DB_NAME diff --git a/tests/file_size/run.sh b/tests/file_size/run.sh index b8670605..f0639332 100644 --- a/tests/file_size/run.sh +++ b/tests/file_size/run.sh @@ -10,7 +10,7 @@ run_sql "create table t (a varchar(255))" chars_20="1111_0000_1111_0000_" # insert 100 records, each occupies 20 bytes -run_sql "insert into t values $(seq -s, 99 | sed "s/[0-9]*/('$chars_20')/g");" +run_sql "insert into t values $(seq -s, 100 | sed 's/,*$//g' | sed "s/[0-9]*/('$chars_20')/g");" # dumping with file size = 200 bytes run_dumpling -F 200 diff --git a/tests/views/run.sh b/tests/views/run.sh index 5907eff4..d1abf272 100644 --- a/tests/views/run.sh +++ b/tests/views/run.sh @@ -9,7 +9,7 @@ export DUMPLING_TEST_DATABASE="views" run_sql "create table t (a bigint, b varchar(255))" run_sql "create definer = 'root'@'localhost' view v as select * from t;" # insert 20 records to `t`. -run_sql "insert into t values $(seq -s, 19 | sed 's/[0-9]*/(\0,"\0")/g')" +run_sql "insert into t values $(seq -s, 20 | sed 's/,*$//g' | sed 's/[0-9]*/(\0,"\0")/g')" run_dumpling --no-views file_not_exist "$DUMPLING_OUTPUT_DIR/views.v-schema.sql" From 9533062a697440a216f5f1c21d2d71c170a7c2de Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 21:47:09 +0800 Subject: [PATCH 10/15] fix ci --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 4ab673d1..45641616 100644 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ set -e -TAG="v3.0.10" +TAG="v4.0.0-beta.1" pwd=$(pwd) mkdir bin/ From 3e0f8fd28ef9afd4660340c7911704f0ddb1e155 Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 21:52:49 +0800 Subject: [PATCH 11/15] debug ci --- tests/_utils/run_lightning | 2 ++ tests/e2e/run.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/_utils/run_lightning b/tests/_utils/run_lightning index 339ba23b..23a1ae90 100755 --- a/tests/_utils/run_lightning +++ b/tests/_utils/run_lightning @@ -7,3 +7,5 @@ echo "[$(date)] Executing bin/tidb-lightning..." conf=$1 bin/tidb-lightning -c $1 + +echo "[$(date)] Executed bin/tidb-lightning" diff --git a/tests/e2e/run.sh b/tests/e2e/run.sh index 5499d26b..2bf9a4e2 100644 --- a/tests/e2e/run.sh +++ b/tests/e2e/run.sh @@ -25,6 +25,7 @@ run_sql "insert into $DB_NAME.$TABLE_NAME values $(seq -s, 100 | sed 's/,*$//g' export DUMPLING_TEST_DATABASE=$DB_NAME run_dumpling +cat "$cur/conf/lightning.toml" # use lightning import data to tidb run_lightning $cur/conf/lightning.toml From 687fe48c81a8dd149e9b72f50bf5a7e6743f3ccb Mon Sep 17 00:00:00 2001 From: luancheng Date: Fri, 6 Mar 2020 22:35:58 +0800 Subject: [PATCH 12/15] debug ci --- tests/e2e/conf/lightning.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/e2e/conf/lightning.toml b/tests/e2e/conf/lightning.toml index 047da004..ecd96989 100644 --- a/tests/e2e/conf/lightning.toml +++ b/tests/e2e/conf/lightning.toml @@ -4,7 +4,6 @@ server-mode = false level = "error" check-requirements = false -file = "/tmp/dumpling_test_result/tidb-lightning.log" [tikv-importer] backend="tidb" From 70c14d6fcfff4299703524b3349dfb45c00dd91d Mon Sep 17 00:00:00 2001 From: luancheng Date: Mon, 9 Mar 2020 19:56:34 +0800 Subject: [PATCH 13/15] fix ci --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 45641616..eb2746a5 100644 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ set -e -TAG="v4.0.0-beta.1" +TAG="v3.1.0-beta.1" pwd=$(pwd) mkdir bin/ From 7ca42688f6601880f98de386bfd6e48e696ba376 Mon Sep 17 00:00:00 2001 From: luancheng Date: Mon, 9 Mar 2020 20:03:15 +0800 Subject: [PATCH 14/15] leave TODO --- install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.sh b/install.sh index eb2746a5..371d7830 100644 --- a/install.sh +++ b/install.sh @@ -2,6 +2,8 @@ set -e +# FIXME: change to latest version after lightning fix issue +# https://github.com/pingcap/tidb-lightning/issues/277 TAG="v3.1.0-beta.1" pwd=$(pwd) From c969d175f264a861f0914c5c0932303025ee5b68 Mon Sep 17 00:00:00 2001 From: 3pointer Date: Tue, 10 Mar 2020 15:13:39 +0800 Subject: [PATCH 15/15] Update tests/_utils/check_sync_diff Co-Authored-By: Ian --- tests/_utils/check_sync_diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_utils/check_sync_diff b/tests/_utils/check_sync_diff index dcf51f53..d7481c62 100755 --- a/tests/_utils/check_sync_diff +++ b/tests/_utils/check_sync_diff @@ -22,7 +22,7 @@ do done if [ $i -ge $check_time ]; then - echo "check diff failed at last" + echo "check data failed, some data are different!!" # show \n and other blanks printf "$(cat $LOG)\n" exit 1