When leadership is lost while leases are being restored make sure we don't shutdown

[briankassouf]

For some reason this check isn't working

vault/vault/expiration.go

Lines 308 to 323 in bb180b8

	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")
	retErr = nil
	default:
	m.logger.Error("error restoring leases", "error", retErr)
	if errorFunc != nil {
	errorFunc()
	}
	}

Continuation of #4915

[jefferai]

Contains checks if the given error contains an error with the message msg. If err is not a wrapped error, this will always return false unless the error itself happens to match this msg.

Probably the error message is not actually matching -- either there isn't a wrapped error matching that, or the error itself isn't. Those should probably be strings.Contains.

[jefferai]

Well, or figure out what the error actually is, make sure it's not matching, and then figure out why it's not matching :-)