Skip to content

Commit 42960c3

Browse files
authored
br: fix the --with-sys-table prompt (#50242) (#50436)
close #50240
1 parent fbedbf9 commit 42960c3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

br/cmd/br/restore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func printWorkaroundOnFullRestoreError(command *cobra.Command, err error) {
8585
fmt.Println("# you can drop existing databases and tables and start restore again")
8686
case errors.ErrorEqual(err, berrors.ErrRestoreIncompatibleSys):
8787
fmt.Println("# the target cluster is not compatible with the backup data,")
88-
fmt.Println("# you can remove 'with-sys-table' flag to skip restoring system tables")
88+
fmt.Println("# you can use '--with-sys-table=false' to skip restoring system tables")
8989
}
9090
fmt.Println("#######################################################################")
9191
}

br/tests/br_stats/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ done
4646

4747
rm -f $LOG
4848
run_br --pd $PD_ADDR restore full -s "local://$TEST_DIR/$DB" --log-file $LOG --filter "${DB}1.*" || cat $LOG
49-
load_cnt=$(cat $LOG | grep "restore stat done" | wc -l)
50-
load_db1_cnt=$(cat $LOG | grep "restore stat done" | grep "${DB}1" | wc -l)
49+
load_cnt=$(cat $LOG | grep "restore statistic data done" | wc -l)
50+
load_db1_cnt=$(cat $LOG | grep "restore statistic data done" | grep "${DB}1" | wc -l)
5151
load_mark=$((${load_cnt}+10*${load_db1_cnt}))
5252
echo "load stats count: ${load_cnt}; db1 count: ${load_db1_cnt}; load mark: ${load_mark}"
5353

5454
if [ "${load_mark}" -ne "11" ]; then
5555
echo "TEST: [$TEST_NAME] fail on load stats"
56-
echo $(cat $LOG | grep "restore stat done")
56+
echo $(cat $LOG | grep "restore statistic data done")
5757
exit 1
5858
fi

0 commit comments

Comments
 (0)