diff --git a/br/pkg/utils/retry.go b/br/pkg/utils/retry.go index 2f8af3a42ed99..026181ca904a3 100644 --- a/br/pkg/utils/retry.go +++ b/br/pkg/utils/retry.go @@ -32,6 +32,12 @@ var retryableServerError = []string{ "body write aborted", "error during dispatch", "put object timeout", +<<<<<<< HEAD +======= + "internalerror", + "not read from or written to within the timeout period", + "requesttimeout", +>>>>>>> 7b5c65f108f (br: add RequestTimeout to list of retryable errors (#41759)) } // RetryableFunc presents a retryable operation. diff --git a/br/tests/br_full/run.sh b/br/tests/br_full/run.sh index 0d15794788b26..62491ef9b0f0c 100755 --- a/br/tests/br_full/run.sh +++ b/br/tests/br_full/run.sh @@ -49,8 +49,17 @@ 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(\"RequestTimeout\")->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 +>>>>>>> 7b5c65f108f (br: add RequestTimeout to list of retryable errors (#41759)) export GO_FAILPOINTS="" size_lz4=$(du -d 0 $TEST_DIR/$DB-lz4 | awk '{print $1}')