resolve conflicts

Signed-off-by: joccau <zak.zhao@pingcap.com>
pingcap · May 26, 2022 · b33fd45 · b33fd45
1 parent 08a3893
commit b33fd45
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/br/pkg/utils/retry.go b/br/pkg/utils/retry.go
@@ -31,11 +31,8 @@ var retryableServerError = []string{
 	"body write aborted",
 	"error during dispatch",
 	"put object timeout",
-<<<<<<< HEAD
-=======
 	"internalerror",
 	"not read from or written to within the timeout period",
->>>>>>> 0f85650aa... br: add error into retry list when backup (#34930)
 }
 
 // RetryableFunc presents a retryable operation.

diff --git a/br/tests/br_full/run.sh b/br/tests/br_full/run.sh
@@ -48,17 +48,12 @@ fi
 
 # backup full
 echo "backup with lz4 start..."
-<<<<<<< HEAD
-export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/backup-storage-error=1*return(\"connection refused\")"
-run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-lz4" --concurrency 4 --compression lz4
-=======
 test_log="${TEST_DIR}/${DB}_test.log"
 error_str="not read from or written to within the timeout period"
 unset BR_LOG_TO_TERM
 
 export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/backup/backup-storage-error=1*return(\"connection refused\")->1*return(\"InternalError\");github.com/pingcap/tidb/br/pkg/backup/backup-timeout-error=1*return(\"not read from or written to within the timeout period\")"
 run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB-lz4" --concurrency 4 --compression lz4 --log-file $test_log
->>>>>>> 0f85650aa... br: add error into retry list when backup (#34930)
 export GO_FAILPOINTS=""
 size_lz4=$(du -d 0 $TEST_DIR/$DB-lz4 | awk '{print $1}')