fix: stop peering delete routine on leader loss

hashicorp · May 26, 2023 · e19c0ce · e19c0ce
1 parent 720dda7
commit e19c0ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.changelog/_5614.txt b/.changelog/_5614.txt
@@ -0,0 +1,4 @@
+```release-note:bug
+namespaces: fixes a bug where namespaces are stuck in a deferred deletion state indefinitely under some conditions.
+Also fixes the Consul query metadata present in the HTTP headers of the namespace read and list endpoints.
+```
diff --git a/agent/consul/leader.go b/agent/consul/leader.go
@@ -364,6 +364,8 @@ func (s *Server) revokeLeadership() {
 
 	s.revokeEnterpriseLeadership()
 
+	s.stopDeferredDeletion()
+
 	s.stopFederationStateAntiEntropy()
 
 	s.stopFederationStateReplication()