Merge branch 'master' into issue-28853

pingcap · Dec 6, 2021 · d54aefb · d54aefb
2 parents 62d2768 + d7c2333
commit d54aefb
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 1,837 deletions.
diff --git a/br/tests/br_log_restore/run.sh b/br/tests/br_log_restore/run.sh
diff --git a/br/tests/br_log_restore/workload b/br/tests/br_log_restore/workload
diff --git a/br/tests/br_other/run.sh b/br/tests/br_other/run.sh
@@ -95,6 +95,8 @@ run_curl https://$PD_ADDR/pd/api/v1/config/schedule | jq '."max-merge-region-siz
 run_curl https://$PD_ADDR/pd/api/v1/config/schedule | jq '."max-merge-region-keys"' | grep -E "^0$"
 
 backup_fail=0
+# generate 1.sst to make another backup failed.
+touch "$TEST_DIR/$DB/lock/1.sst"
 echo "another backup start expect to fail due to last backup add a lockfile"
 run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB/lock" --concurrency 4 || backup_fail=1
 if [ "$backup_fail" -ne "1" ];then

diff --git a/cmd/benchfilesort/README.md b/cmd/benchfilesort/README.md