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

rangefeed: attempt to resolve intents on barrier failure #119515

Closed
wants to merge 1 commit into from
Closed

rangefeed: attempt to resolve intents on barrier failure #119515

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 pkg/kv/kvserver/rangefeed/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,13 @@ func (a *txnPushAttempt) pushOldTxns(ctx context.Context) error {
// that it won't get wedged.
err := timeutil.RunWithTimeout(ctx, "pushtxns barrier", time.Minute, a.pusher.Barrier)
if err != nil {
return err
// If the barrier fails, let's do best-effort intent resolution anyway.
// If the intents get resolved we might not need the barrier at all.
//
// TODO(erikgrinaker): verify that this is actually safe for an ambiguous
// abort. There doesn't seem to be any protection for this when resolving
// intents.
return errors.Join(err, a.pusher.ResolveIntents(ctx, intentsToCleanup))
}
}

Expand Down
Loading