Skip to content

[8.0] VDiff/Tablet Picker: fix picker retry logic to handle canceled context #6954

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

Merged
rohit-nayak-ps merged 1 commit into from
Oct 27, 2020
Merged

[8.0] VDiff/Tablet Picker: fix picker retry logic to handle canceled context #6954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion go/vt/discovery/tablet_picker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,13 @@ func (tp *TabletPicker) PickForStreaming(ctx context.Context) (*topodatapb.Table
// if no candidates were found, sleep and try again
log.Infof("No tablet found for streaming, shard %s.%s, cells %v, tabletTypes %v, sleeping for %d seconds",
tp.keyspace, tp.shard, tp.cells, tp.tabletTypes, int(GetTabletPickerRetryDelay()/1e9))
time.Sleep(GetTabletPickerRetryDelay())
timer := time.NewTimer(GetTabletPickerRetryDelay())
select {
case <-ctx.Done():
timer.Stop()
return nil, vterrors.Errorf(vtrpcpb.Code_CANCELED, "context has expired")
case <-timer.C:
}
continue
}
// try at most len(candidate) times to find a healthy tablet
Expand Down
2 changes: 1 addition & 1 deletion go/vt/wrangler/vdiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ func (td *tableDiffer) diff(ctx context.Context, wr *Wrangler) (*DiffReport, err
advanceTarget := true
for {
if s := logSteps(int64(dr.ProcessedRows)); s != "" {
log.Infof("VDiff processed %s rows", s)
log.Infof("VDiff progress:: table %s: %s rows", td.targetTable, s)
}
if advanceSource {
sourceRow, err = sourceExecutor.next()
Expand Down