status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

proxycfg: ensure all of the watches are canceled if they are cancelable (#11824)

This commit is contained in:
R.B. Boyer 2021-12-13 15:56:17 -06:00 committed by GitHub
parent f81dd817ff
commit 81ea8129d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11824.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
proxycfg: ensure all of the watches are canceled if they are cancelable
```

10
agent/proxycfg/connect_proxy.go
View File

@ -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 // 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 { if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
continue continue
} }
if _, ok := seenServices[sn]; !ok { if _, ok := seenServices[sn]; !ok {
for _, cancelFn := range targets {
cancelFn()
}
delete(snap.ConnectProxy.WatchedUpstreams, sn) delete(snap.ConnectProxy.WatchedUpstreams, sn)
} }
} }
@ -289,11 +292,14 @@ func (s *handlerConnectProxy) handleUpdate(ctx context.Context, u cache.UpdateEv
delete(snap.ConnectProxy.WatchedUpstreamEndpoints, sn) 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 { if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
continue continue
} }
if _, ok := seenServices[sn]; !ok { if _, ok := seenServices[sn]; !ok {
for _, cancelFn := range cancelMap {
cancelFn()
}
delete(snap.ConnectProxy.WatchedGateways, sn) delete(snap.ConnectProxy.WatchedGateways, sn)
} }
} }