Locking updates in database backend #3774
Merged
Conversation
This file contains 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
| unlockFunc() | ||
| return nil, fmt.Errorf("cound not retrieve db with name: %s, got error: %s", role.DBName, err) | ||
| // Check again | ||
| db, ok = b.getDBObj(role.DBName) |
There was a problem hiding this comment.
FWIW, the createDBObj function does this check at the beginning of the function, so doesn't necessarily need to happen here.
| if err != nil { | ||
| unlockFunc() | ||
| b.closeIfShutdown(role.DBName, err) |
There was a problem hiding this comment.
rather than giving up the lock and requiring it in the closeIfShutdown function what if we unlocked after the closeIfShutdown call. That'll protect against another thread getting the lock before we reset the plugin.
There was a problem hiding this comment.
I originally went down that route but we don't always have the write lock when this method gets called.
|
LGTM; we'll accept the race condition for now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
There was one place where the lock could potentially not be released. Specifically https://github.com/hashicorp/vault/blob/master/builtin/logical/database/secret_creds.go#L72.