vault: support core shutdown

This commit is contained in:
Armon Dadgar 2015-06-17 18:23:59 -07:00
parent 1f963ec1bb
commit dbf6cf6e6d
2 changed files with 34 additions and 0 deletions

View file

@ -328,6 +328,21 @@ func NewCore(conf *CoreConfig) (*Core, error) {
return c, nil return c, nil
} }
// Shutdown is invoked when the Vault instance is about to be terminated. It
// should not be accessible as part of an API call as it will cause an availability
// problem. It is only used to gracefully quit in the case of HA so that failover
// happens as quickly as possible.
func (c *Core) Shutdown() error {
c.stateLock.Lock()
defer c.stateLock.Unlock()
if c.sealed {
return nil
}
// Seal the Vault, causes a leader stepdown
return c.sealInternal()
}
// HandleRequest is used to handle a new incoming request // HandleRequest is used to handle a new incoming request
func (c *Core) HandleRequest(req *logical.Request) (resp *logical.Response, err error) { func (c *Core) HandleRequest(req *logical.Request) (resp *logical.Response, err error) {
c.stateLock.RLock() c.stateLock.RLock()
@ -930,6 +945,14 @@ func (c *Core) Seal(token string) error {
return err return err
} }
// Seal the Vault
return c.sealInternal()
}
// sealInternal is an internal method used to seal the vault.
// It does not do any authorization checking. The stateLock must
// be held prior to calling.
func (c *Core) sealInternal() error {
// Enable that we are sealed to prevent furthur transactions // Enable that we are sealed to prevent furthur transactions
c.sealed = true c.sealed = true

View file

@ -348,6 +348,17 @@ func TestCore_SealUnseal(t *testing.T) {
} }
} }
// Attempt to shutdown after unseal
func TestCore_Shutdown(t *testing.T) {
c, _, _ := TestCoreUnsealed(t)
if err := c.Shutdown(); err != nil {
t.Fatalf("err: %v", err)
}
if sealed, err := c.Sealed(); err != nil || !sealed {
t.Fatalf("err: %v", err)
}
}
// Attempt to seal bad token // Attempt to seal bad token
func TestCore_Seal_BadToken(t *testing.T) { func TestCore_Seal_BadToken(t *testing.T) {
c, _, _ := TestCoreUnsealed(t) c, _, _ := TestCoreUnsealed(t)