port (#10729)

hashicorp · Jan 19, 2021 · 9b7b2f5 · 9b7b2f5
1 parent 7a7d30a
commit 9b7b2f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/changelog/10708.txt b/changelog/10708.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+ metrics: Protect emitMetrics from panicking during post-seal
+ ```
diff --git a/vault/core_metrics.go b/vault/core_metrics.go
@@ -242,6 +242,13 @@ func (c *Core) findKvMounts() []*kvMount {
 	c.mountsLock.RLock()
 	defer c.mountsLock.RUnlock()
 
+	// emitMetrics doesn't grab the statelock, so this code might run during or after the seal process.
+	// Therefore, we need to check if c.mounts is nil. If we do not, emitMetrics will panic if this is
+	// run after seal.
+	if c.mounts == nil {
+		return mounts
+	}
+
 	for _, entry := range c.mounts.Entries {
 		if entry.Type == "kv" {
 			version, ok := entry.Options["version"]