From bf6dbcd47b199b0d597fe3df7b7fccefd403fde3 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Tue, 13 Jun 2023 10:45:44 -0400 Subject: [PATCH] backport of commit 38a42074efae2ba85663f696a971fdd1cc334681 (#17702) Co-authored-by: DanStough --- .changelog/17483.txt | 3 +++ .changelog/_5614.txt | 4 ++++ agent/consul/leader.go | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 .changelog/17483.txt create mode 100644 .changelog/_5614.txt diff --git a/.changelog/17483.txt b/.changelog/17483.txt new file mode 100644 index 000000000..26c81dbe4 --- /dev/null +++ b/.changelog/17483.txt @@ -0,0 +1,3 @@ +```release-note:bug +peering: Fix a bug that caused server agents to continue cleaning up peering resources even after loss of leadership. +``` diff --git a/.changelog/_5614.txt b/.changelog/_5614.txt new file mode 100644 index 000000000..9951b9111 --- /dev/null +++ b/.changelog/_5614.txt @@ -0,0 +1,4 @@ +```release-note:bug +namespaces: **(Enterprise only)** 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 index f2905e6d8..c91655c5c 100644 --- 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()