resolve conflicts

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

br/tests/br_full_ddl/run.sh

@@ -22,11 +22,7 @@ LOG=/$TEST_DIR/backup.log
 RESTORE_LOG=LOG=/$TEST_DIR/restore.log
 BACKUP_STAT=/$TEST_DIR/backup_stat
 RESOTRE_STAT=/$TEST_DIR/restore_stat
-<<<<<<< HEAD
-=======
-CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 res_file="$TEST_DIR/sql_res.$TEST_NAME.txt"
->>>>>>> 5399ca70da9 (br: fix br integration test (#53836))
 
 run_sql "CREATE DATABASE $DB;"
 go-ycsb load mysql -P tests/$TEST_NAME/workload -p mysql.host=$TIDB_IP -p mysql.port=$TIDB_PORT -p mysql.user=root -p mysql.db=$DB

br/tests/br_pitr/run.sh

@@ -98,7 +98,6 @@ restart_services
 echo "run pitr"
 run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1
 
-<<<<<<< HEAD
 # check something in downstream cluster
 echo "check br log"
 check_contains "restore log success summary"
@@ -110,67 +109,54 @@ run_sql "select * from mysql.gc_delete_range_done"
 run_sql "select count(*) DELETE_RANGE_CNT from (select * from mysql.gc_delete_range union all select * from mysql.gc_delete_range_done) del_range group by ts order by DELETE_RANGE_CNT desc limit 1;"
 expect_delete_range=$(($incremental_delete_range_count-$prepare_delete_range_count))
 check_contains "DELETE_RANGE_CNT: $expect_delete_range"
-=======
-check_result
 
-# start a new cluster for incremental + log
-echo "restart a services"
-restart_services
-
-echo "run snapshot restore#2"
-run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$PREFIX/full" 
-
-echo "run incremental restore + log restore"
-run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/inc" > $res_file 2>&1
-
-check_result
-
-# start a new cluster for incremental + log
+# start a new cluster for corruption
 echo "restart a services"
 restart_services
 
-echo "run snapshot restore#3"
-run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$PREFIX/full" 
+file_corruption() {
+    echo "corrupt the whole log files"
+    for filename in $(find $TEST_DIR/$PREFIX/log -regex ".*\.log" | grep -v "schema-meta"); do
+        echo "corrupt the log file $filename"
+        filename_temp=$filename"_temp"
+        echo "corruption" > $filename_temp
+        cat $filename >> $filename_temp
+        mv $filename_temp $filename
+        truncate -s -11 $filename
+    done
+}
 
-echo "run incremental restore but failed"
+# file corruption
+file_corruption
+export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/utils/set-import-attempt-to-one=return(true)"
 restore_fail=0
-run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$PREFIX/inc_fail" || restore_fail=1
+run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" || restore_fail=1
+export GO_FAILPOINTS=""
 if [ $restore_fail -ne 1 ]; then
-    echo 'pitr success' 
+    echo 'pitr success on file corruption' 
     exit 1
 fi
 
 # start a new cluster for corruption
 echo "restart a services"
 restart_services
 
-echo "corrupt a log file"
-filename=$(find $TEST_DIR/$PREFIX/log -regex ".*\.log" | grep -v "schema-meta" | tail -n 1)
-filename_temp=$filename"_temp"
-filename_bak=$filename"_bak"
-echo "corruption" > $filename_temp
-cat $filename >> $filename_temp
+file_lost() {
+    echo "lost the whole log files"
+    for filename in $(find $TEST_DIR/$PREFIX/log -regex ".*\.log" | grep -v "schema-meta"); do
+        echo "lost the log file $filename"
+        filename_temp=$filename"_temp"
+        mv $filename $filename_temp
+    done
+}
 
 # file lost
-mv $filename $filename_bak
-export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/utils/set-import-attempt-to-one=return(true)"
-restore_fail=0
-run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" || restore_fail=1
-export GO_FAILPOINTS=""
-if [ $restore_fail -ne 1 ]; then
-    echo 'pitr success' 
-    exit 1
-fi
-
-# file corruption
-mv $filename_temp $filename
-truncate --size=-11 $filename
+file_lost
 export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/utils/set-import-attempt-to-one=return(true)"
 restore_fail=0
 run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" || restore_fail=1
 export GO_FAILPOINTS=""
 if [ $restore_fail -ne 1 ]; then
-    echo 'pitr success' 
+    echo 'pitr success on file lost' 
     exit 1
 fi
->>>>>>> 5399ca70da9 (br: fix br integration test (#53836))