Skip to content

Use separate context for Redis mutex unlock #7835

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

Draft
vlasebian wants to merge 1 commit into
base: v3.35
Choose a base branch
from
Draft

Use separate context for Redis mutex unlock #7835

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
6 changes: 5 additions & 1 deletion pkg/redis/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,11 @@ func LockedWatch(ctx context.Context, r WatchCmdable, k, id string, expiration t
return err
}
defer func() {
if err := UnlockMutex(ctx, r, k, id, expiration); err != nil {
// Use a separate context with timeout for unlocking to ensure that we attempt to unlock the mutex even if
// the main context is already expired.
unlockCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Second)
defer cancel()
if err := UnlockMutex(unlockCtx, r, k, id, expiration); err != nil {
log.FromContext(ctx).WithField("key", k).WithError(err).Error("Failed to unlock mutex")
}
}()
Expand Down
Loading