mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-01 19:17:58 +00:00
Continuously attempt to unseal if sealed keys are supported (#6039)
* Add helper for checking if an error is a fatal error The double-double negative was really confusing, and this pattern is used a few places in Vault. This negates the double negative, making the devx a bit easier to follow. * Check return value of UnsealWithStoredKeys in sys/init * Return proper error types when attempting unseal with stored key Prior to this commit, "nil" could have meant unsupported auto-unseal, a transient error, or success. This updates the function to return the correct error type, signaling to the caller whether they should retry or fail. * Continuously attempt to unseal if sealed keys are supported This fixes a bug that occurs on bootstrapping an initial cluster. Given a collection of Vault nodes and an initialized storage backend, they will all go into standby waiting for initialization. After one node is initialized, the other nodes had no mechanism by which they "re-check" to see if unseal keys are present. This adds a goroutine to the server command which continually waits for unseal keys to exist. It exits in the following conditions: - the node is unsealed - the node does not support stored keys - a fatal error occurs (as defined by Vault) - the server is shutting down In all other situations, the routine wakes up at the specified interval and attempts to unseal with the stored keys.
This commit is contained in:
committed by
Jeff Mitchell
parent
345a445430
commit
f0ab6b525e
@@ -741,7 +741,7 @@ CLUSTER_SYNTHESIS_COMPLETE:
|
||||
// Initialize the core
|
||||
core, newCoreError := vault.NewCore(coreConfig)
|
||||
if newCoreError != nil {
|
||||
if !errwrap.ContainsType(newCoreError, new(vault.NonFatalError)) {
|
||||
if vault.IsFatalError(newCoreError) {
|
||||
c.UI.Error(fmt.Sprintf("Error initializing core: %s", newCoreError))
|
||||
return 1
|
||||
}
|
||||
@@ -937,12 +937,31 @@ CLUSTER_SYNTHESIS_COMPLETE:
|
||||
return 1
|
||||
}
|
||||
|
||||
if err := core.UnsealWithStoredKeys(context.Background()); err != nil {
|
||||
if !errwrap.ContainsType(err, new(vault.NonFatalError)) {
|
||||
c.UI.Error(fmt.Sprintf("Error initializing core: %s", err))
|
||||
return 1
|
||||
// Attempt unsealing in a background goroutine. This is needed for when a
|
||||
// Vault cluster with multiple servers is configured with auto-unseal but is
|
||||
// uninitialized. Once one server initializes the storage backend, this
|
||||
// goroutine will pick up the unseal keys and unseal this instance.
|
||||
go func() {
|
||||
for {
|
||||
err := core.UnsealWithStoredKeys(context.Background())
|
||||
if err == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if vault.IsFatalError(err) {
|
||||
c.logger.Error(fmt.Sprintf("Error unsealing core", "error", err))
|
||||
return
|
||||
} else {
|
||||
c.logger.Warn(fmt.Sprintf("Failed to unseal core", "error" err))
|
||||
}
|
||||
|
||||
select {
|
||||
case <-c.ShutdownCh:
|
||||
return
|
||||
case <-time.After(5 * time.Second):
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
// Perform service discovery registrations and initialization of
|
||||
// HTTP server after the verifyOnly check.
|
||||
|
||||
Reference in New Issue
Block a user