Move location of quit channel closing in exp manager #3638
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
If it happens after stopping timers any timers firing before all timers are stopped will still run the revocation function. With plugin auto-crash-recovery this could end up instantiating a plugin that could then try to unwrap a token from a nil token store. This also plumbs in core so that we can grab a read lock during the operation and check standby/sealed status before running it (after grabbing the lock).
briankassouf
reviewed
Dec 1, 2017
vault/expiration.go
Outdated
| tokenView *BarrierView | ||
| tokenStore *TokenStore | ||
| logger log.Logger | ||
| coreStateLock *sync.RWMutex |
There was a problem hiding this comment.
If we are storing core, we don't need to also store the state lock
There was a problem hiding this comment.
It's true, the main reason I kept it like this is I would really rather not plumb through core, I just also figured we should check standby and sealed while we were at it and didn't feel like storing two pointers to bools. So I left it the easiest way to plumb back out.
briankassouf
previously approved these changes
Dec 1, 2017
briankassouf
reviewed
Dec 1, 2017
| @@ -969,13 +980,24 @@ func (m *ExpirationManager) expireID(leaseID string) { | |||
| return | |||
| default: | |||
| } | |||
|
|
|||
| m.coreStateLock.RLock() | |||
| if m.quitContext.Err() == context.Canceled { | |||
There was a problem hiding this comment.
Small nit, but this might be a better way of handling this case:
select {
case <- m.quitContext.Done():
m.logger.Error("expiration: core context canceled, not attempting further revocation of lease", "lease_id", leaseID)
m.coreStateLock.RUnlock()
return
default:
}
There was a problem hiding this comment.
This should be safe; see https://golang.org/pkg/context/#pkg-variables
Canceled is the error returned by Context.Err when the context is canceled.
It's defined behavior so should be reliable.
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.
If it happens after stopping timers any timers firing before all timers
are stopped will still run the revocation function. With plugin
auto-crash-recovery this could end up instantiating a plugin that could
then try to unwrap a token from a nil token store.
This also plumbs in core so that we can grab a read lock during the
operation and check standby/sealed status before running it (after
grabbing the lock).