Drop Pantry locks before Volume operations#1952
Merged
jmpesp merged 1 commit intoJun 23, 2026
Merged
Conversation
Holding the `entries` lock across an activation or deactivation will lock out _all_ other Pantry operations. If a activation or deactivation can not complete, this makes the Pantry un-usable. Drop the mutex guards before long-running operations. Also: in the Pantry implementation, re-implement `attach` in terms of `attach_activate_background`, which already does the activation in the background and drops the `entries` lock. However callers of `attach` expect the Volume to be activated when the call returns so wait for the background job. Co-authored-by: Alan <alan@oxide.computer> Fixes oxidecomputer#1945.
leftwo
approved these changes
Jun 23, 2026
leftwo
left a comment
leftwo
left a comment
Contributor
There was a problem hiding this comment.
I would like the pantry test in here as well, but I can add that in a follow up PR.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Holding the
entrieslock across an activation or deactivation will lock out all other Pantry operations. If a activation or deactivation can not complete, this makes the Pantry un-usable.Drop the mutex guards before long-running operations.
Also: in the Pantry implementation, re-implement
attachin terms ofattach_activate_background, which already does the activation in the background and drops theentrieslock. However callers ofattachexpect the Volume to be activated when the call returns so wait for the background job.Co-authored-by: Alan alan@oxide.computer
Fixes #1945.