Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Commit ca8c9f7

Browse files
authored
test: Fix br_300_small_tables bug (#1367) (#1368)
1 parent b0abbca commit ca8c9f7

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

  • tests/br_300_small_tables

tests/br_300_small_tables/run.sh

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ DB="$TEST_NAME"
1818
TABLES_COUNT=300
1919

2020
PROGRESS_FILE="$TEST_DIR/progress_file"
21-
BACKUP_LOG="$TEST_DIR/backup.log"
21+
BACKUPMETAV1_LOG="$TEST_DIR/backup.log"
2222
BACKUPMETAV2_LOG="$TEST_DIR/backupv2.log"
2323
RESTORE_LOG="$TEST_DIR/restore.log"
24-
RESTOREMETAV2_LOG="$TEST_DIR/restorev2.log"
2524
rm -rf $PROGRESS_FILE
2625

2726
# functions to do float point arithmetric
@@ -40,11 +39,11 @@ done
4039
# backup db
4140
echo "backup meta v2 start..."
4241
unset BR_LOG_TO_TERM
43-
rm -f $BACKUP_LOG
42+
rm -f $BACKUPMETAV2_LOG
4443
export GO_FAILPOINTS="github.com/pingcap/br/pkg/task/progress-call-back=return(\"$PROGRESS_FILE\")"
45-
run_br backup db --db "$DB" --log-file $BACKUP_LOG -s "local://$TEST_DIR/${DB}v2" --pd $PD_ADDR --use-backupmeta-v2
46-
backup_size=`tail -n 2 ${BACKUP_LOG} | grep "backup data size" | grep -oP '\[\K[^\]]+' | grep "backup data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'`
47-
echo "backup meta v2 backup size is ${backup_size}"
44+
run_br backup db --db "$DB" --log-file $BACKUPMETAV2_LOG -s "local://$TEST_DIR/${DB}v2" --pd $PD_ADDR --use-backupmeta-v2
45+
backupv2_size=`grep "backup data size" "${BACKUPMETAV2_LOG}" | grep -oP '\[\K[^\]]+' | grep "backup data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'`
46+
echo "backup meta v2 backup size is ${backupv2_size}"
4847
export GO_FAILPOINTS=""
4948

5049
if [[ "$(wc -l <$PROGRESS_FILE)" == "1" ]] && [[ $(grep -c "range" $PROGRESS_FILE) == "1" ]];
@@ -59,13 +58,13 @@ fi
5958
rm -rf $PROGRESS_FILE
6059

6160
echo "backup meta v1 start..."
62-
rm -f $BACKUPMETAV2_LOG
63-
run_br backup db --db "$DB" --log-file $BACKUPMETAV2_LOG -s "local://$TEST_DIR/$DB" --pd $PD_ADDR
64-
backupv2_size=`tail -n 2 ${BACKUPMETAV2_LOG} | grep "backup data size" | grep -oP '\[\K[^\]]+' | grep "backup data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'`
65-
echo "backup meta v1 backup size is ${backupv2_size}"
61+
rm -f $BACKUPMETAV1_LOG
62+
run_br backup db --db "$DB" --log-file $BACKUPMETAV1_LOG -s "local://$TEST_DIR/$DB" --pd $PD_ADDR
63+
backupv1_size=`grep "backup data size" "${BACKUPMETAV1_LOG}" | grep -oP '\[\K[^\]]+' | grep "backup data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'`
64+
echo "backup meta v1 backup size is ${backupv1_size}"
6665

6766

68-
if [ $(calc "${backup_size}-${backupv2_size}==0") -eq 1 ]; then
67+
if [ $(calc "${backupv1_size}-${backupv2_size}==0") -eq 1 ]; then
6968
echo "backup meta v1 data size match backup meta v2 data size"
7069
else
7170
echo "statistics unmatch"
@@ -83,11 +82,11 @@ done
8382
rm -rf $RESTORE_LOG
8483
echo "restore 1/300 of the table start..."
8584
run_br restore table --db $DB --table "sbtest100" --log-file $RESTORE_LOG -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --no-schema
86-
restore_size=`tail -n 2 ${RESTORE_LOG} | grep "restore data size" | grep -oP '\[\K[^\]]+' | grep "restore data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'`
85+
restore_size=`grep "restore data size" "${RESTORE_LOG}" | grep -oP '\[\K[^\]]+' | grep "restore data size" | awk -F '=' '{print $2}' | grep -oP '\d*\.\d+'`
8786
echo "restore data size is ${restore_size}"
8887

89-
diff=$(calc "$backup_size-$restore_size*$TABLES_COUNT")
90-
echo ${diff}
88+
diff=$(calc "$backupv2_size-$restore_size*$TABLES_COUNT")
89+
echo "the difference is ${diff}"
9190

9291
threshold="1"
9392

0 commit comments

Comments
 (0)