Skip to content

PlannedReparent: create a new context for calling UndoDemoteMaster #5841

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
deepthi merged 1 commit into from
Feb 24, 2020
Merged

PlannedReparent: create a new context for calling UndoDemoteMaster #5841

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
7 changes: 6 additions & 1 deletion go/vt/wrangler/reparent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,12 @@ func (wr *Wrangler) plannedReparentShardLocked(ctx context.Context, ev *events.R
if err != nil || (ctx.Err() != nil && ctx.Err() == context.DeadlineExceeded) {
// If we fail to promote the new master, try to roll back to the
// original master before aborting.
undoCtx, undoCancel := context.WithTimeout(ctx, *topo.RemoteOperationTimeout)
// It is possible that we have used up the original context, or that
// not enough time is left on it before it times out.
// But at this point we really need to be able to Undo so as not to
// leave the cluster in a bad state.
// So we create a fresh context based on context.Background().
undoCtx, undoCancel := context.WithTimeout(context.Background(), *topo.RemoteOperationTimeout)
defer undoCancel()
if err1 := wr.tmc.UndoDemoteMaster(undoCtx, oldMasterTabletInfo.Tablet); err1 != nil {
log.Warningf("Encountered error %v while trying to undo DemoteMaster", err1)
Expand Down