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

br: Fix new collaction enable check (#33500) #33532

Merged
merged 13 commits into from
Apr 28, 2022
Merged

br: Fix new collaction enable check (#33500) #33532

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7f60040
cherry pick #33500 to release-5.4
joccau Mar 28, 2022
4182afa
resolve conflict
3pointer Apr 27, 2022
01c605f
use an compatible kvproto version
3pointer Apr 27, 2022
aafdaff
fix test
3pointer Apr 27, 2022
3819c49
fix test
3pointer Apr 27, 2022
187eb8b
remove test result
3pointer Apr 27, 2022
fa05684
fix test
3pointer Apr 27, 2022
6b5db35
fix fmt
3pointer Apr 28, 2022
66a78fc
update kvproto
3pointer Apr 28, 2022
603331c
update kvproto
3pointer Apr 28, 2022
3384d6a
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
ti-chi-bot Apr 28, 2022
b36ad1e
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
3pointer Apr 28, 2022
a942df9
Merge branch 'release-5.4' into release-5.4-8f8dfafc105d
ti-chi-bot Apr 28, 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
Prev Previous commit
Next Next commit
fix fmt
  • Loading branch information
@3pointer
3pointer committed Apr 28, 2022
commit 6b5db35009482a16dc93c66dfaa5490712fea4a7
3 changes: 1 addition & 2 deletions br/pkg/task/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func CheckNewCollationEnable(
storage kv.Storage,
) error {
if backupNewCollationEnable == "" {
log.Warn("new_collations_enabled_on_first_bootstrap not found in backupmeta. "+
log.Warn("new_collations_enabled_on_first_bootstrap not found in backupmeta. " +
"we assume that this config is as same as backup cluster")
return nil
}
Expand All @@ -243,7 +243,6 @@ func CheckNewCollationEnable(
return nil
}


// RunRestore starts a restore task inside the current goroutine.
func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConfig) error {
cfg.adjustRestoreConfig()
Expand Down