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

Prevent a deadlock in expiration #22374

Merged
merged 4 commits into from Aug 16, 2023
Merged

Prevent a deadlock in expiration #22374

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9498abb
Prevent a deadlock that occurs when Restore grabs lease lock then pen…
hc-github-team-secure-vault-core Aug 16, 2023
be9ed68
Fix lock
hc-github-team-secure-vault-core Aug 16, 2023
eaf84d9
Add CL
hc-github-team-secure-vault-core Aug 16, 2023
04ed2e4
Grab lock before markLeaseIrrevocable
hc-github-team-secure-vault-core Aug 16, 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
4 changes: 3 additions & 1 deletion vault/expiration.go
View file
Open in desktop
Expand Up @@ -240,12 +240,12 @@ func (r *revocationJob) OnFailure(err error) {
r.m.core.metricSink.IncrCounterWithLabels([]string{"expire", "lease_expiration", "error"}, 1, []metrics.Label{metricsutil.NamespaceLabel(r.ns)})

r.m.pendingLock.Lock()
defer r.m.pendingLock.Unlock()
pendingRaw, ok := r.m.pending.Load(r.leaseID)
if !ok {
r.m.logger.Warn("failed to find lease in pending map for revocation retry", "lease_id", r.leaseID)
return
ncabatoff marked this conversation as resolved.
Show resolved Hide resolved
}
r.m.pendingLock.Unlock()

pending := pendingRaw.(pendingInfo)
pending.revokesAttempted++
Expand Down Expand Up @@ -277,7 +277,9 @@ func (r *revocationJob) OnFailure(err error) {
}

pending.timer.Reset(newTimer)
r.m.pendingLock.Lock()
r.m.pending.Store(r.leaseID, pending)
r.m.pendingLock.Unlock()
}

func expireLeaseStrategyFairsharing(ctx context.Context, m *ExpirationManager, leaseID string, ns *namespace.Namespace) {
Expand Down