proxycfg: ensure all of the watches are canceled if they are cancelab…

…le (#11824)
hashicorp · Dec 13, 2021 · 76803dc · 76803dc
1 parent 70f0afb
commit 76803dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.changelog/11824.txt b/.changelog/11824.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+proxycfg: ensure all of the watches are canceled if they are cancelable
+```
diff --git a/agent/proxycfg/connect_proxy.go b/agent/proxycfg/connect_proxy.go
@@ -273,11 +273,14 @@ func (s *handlerConnectProxy) handleUpdate(ctx context.Context, u cache.UpdateEv
 		}
 
 		// Clean up data from services that were not in the update
-		for sn := range snap.ConnectProxy.WatchedUpstreams {
+		for sn, targets := range snap.ConnectProxy.WatchedUpstreams {
 			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {
+				for _, cancelFn := range targets {
+					cancelFn()
+				}
 				delete(snap.ConnectProxy.WatchedUpstreams, sn)
 			}
 		}
@@ -289,11 +292,14 @@ func (s *handlerConnectProxy) handleUpdate(ctx context.Context, u cache.UpdateEv
 				delete(snap.ConnectProxy.WatchedUpstreamEndpoints, sn)
 			}
 		}
-		for sn := range snap.ConnectProxy.WatchedGateways {
+		for sn, cancelMap := range snap.ConnectProxy.WatchedGateways {
 			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {
+				for _, cancelFn := range cancelMap {
+					cancelFn()
+				}
 				delete(snap.ConnectProxy.WatchedGateways, sn)
 			}
 		}