luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Fix race during proxy closing (#13283)

Browse source 
p.service is written to within the Serve method. The Serve method also waits for the stopChan to be closed.

The race was between Close being called on the proxy causing Close on the service which was written to around the same time in the Serve method.

The fix is to have Serve be responsible for closing p.service.
This commit is contained in:
Matt Keeler 2022-05-27 16:52:03 -04:00 committed by GitHub
parent d79fbf98f7
commit 4814733934
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
connect/proxy/proxy.go
View file

@ -123,6 +123,9 @@ func (p *Proxy) Serve() error {
cfg = newCfg
case <-p.stopChan:
if p.service != nil {
p.service.Close()
}
return nil
}
}
@ -153,7 +156,4 @@ func (p *Proxy) startListener(name string, l *Listener) error {
// called only once.
func (p *Proxy) Close() {
close(p.stopChan)
if p.service != nil {
p.service.Close()
}
}