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

pdutil: wait after updating region label rules #49479

Merged
merged 10 commits into from
Dec 21, 2023
Merged

pdutil: wait after updating region label rules #49479

Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e6f574d
pdutil: wait after updating region label rules
tangenta Dec 14, 2023
6233988
Update br/pkg/pdutil/pd.go
tangenta Dec 14, 2023
6aa0f66
Merge remote-tracking branch 'upstream/master' into HEAD
tangenta Dec 18, 2023
6840773
dump on timeout
tangenta Dec 18, 2023
06ab684
move dump to TestAddIndexDistPauseAndResume
tangenta Dec 19, 2023
ee0399a
try to fix blocking test TestAddIndexDistPauseAndResume
tangenta Dec 20, 2023
4147faf
Revert "try to fix blocking test TestAddIndexDistPauseAndResume"
tangenta Dec 20, 2023
240bf30
Revert "move dump to TestAddIndexDistPauseAndResume"
tangenta Dec 20, 2023
facca8e
Revert "dump on timeout"
tangenta Dec 20, 2023
1b92b15
Merge remote-tracking branch 'upstream/master' into HEAD
tangenta Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions br/pkg/pdutil/pd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,11 @@ func (p *PdController) CreateOrUpdateRegionLabelRule(ctx context.Context, rule L
_, lastErr = pdRequest(ctx, addr, pdhttp.RegionLabelRule,
p.cli, http.MethodPost, reqData)
if lastErr == nil {
// Wait for the rule to take effect because the PD operator is processed asynchronously.
// To synchronize this, checking the operator status may not be enough. For details, see
// https://github.com/pingcap/tidb/issues/49477.
// Let's use two times default value of `patrol-region-interval` from PD configuration.
<-time.After(20 * time.Millisecond)
return nil
}
if berrors.IsContextCanceled(lastErr) {
Expand Down