Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

br: fix merge conflict #36775

Merged
merged 3 commits into from
Aug 1, 2022
Merged

br: fix merge conflict #36775

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84488a4
fix merge conflict
D3Hunter Aug 1, 2022
7e14efb
fix
D3Hunter Aug 1, 2022
e7307db
Merge branch 'release-6.2' into fix-merge-conflict
ti-chi-bot Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions br/tests/br_split_region_fail/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,9 @@ done
echo "restore start..."

unset BR_LOG_TO_TERM
<<<<<<< HEAD
GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/restore/not-leader-error=1*return(true)->1*return(false);\
github.com/pingcap/tidb/br/pkg/restore/somewhat-retryable-error=3*return(true)" \
run_br restore full --filter '*.*' --filter '!mysql.*' -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --ratelimit 1024 --log-file $LOG || true
=======
GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/restore/split/not-leader-error=1*return(true)->1*return(false);\
github.com/pingcap/tidb/br/pkg/restore/split/somewhat-retryable-error=3*return(true)" \
run_br restore full -s "local://$TEST_DIR/$DB" --pd $PD_ADDR --ratelimit 1024 --log-file $LOG || true
>>>>>>> cb211e0ed... br: add flag to control whether restore priv table on default (#36652)
BR_LOG_TO_TERM=1

grep "a error occurs on split region" $LOG && \
Expand Down