Don't shutdown if we lose leadership during lease restoration (#4924)

* Don't shutdown if we lose leadership during lease restoration * Update comment
hashicorp · Jul 13, 2018 · 146a684 · 146a684
1 parent 9c258c7
commit 146a684
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/vault/expiration.go b/vault/expiration.go
@@ -307,6 +307,10 @@ func (m *ExpirationManager) Restore(errorFunc func()) (retErr error) {
 
 		switch {
 		case retErr == nil:
+		case errwrap.Contains(retErr, context.Canceled.Error()):
+			// Don't run error func because we lost leadership
+			m.logger.Warn("context cancled while restoring leases, stopping lease loading")
+			retErr = nil
 		case errwrap.Contains(retErr, ErrBarrierSealed.Error()):
 			// Don't run error func because we're likely already shutting down
 			m.logger.Warn("barrier sealed while restoring leases, stopping lease loading")