lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcd: world: Make sure to check if wg is nil or not

Browse Source 
We never hit this as far as I know, but might as well be safe.
This commit is contained in:
James Shubin
2023-08-07 23:11:20 -04:00
parent 5d84e33be7
commit 3f403d34a4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
etcd/world.go
View File

@@ -74,9 +74,14 @@ func (obj *World) IdealClusterSizeWatch(ctx context.Context) (chan error, error)
if err := c.Init(); err != nil { if err := c.Init(); err != nil {
return nil, err return nil, err
} }
util.WgFromCtx(ctx).Add(1) wg := util.WgFromCtx(ctx)
if wg != nil {
wg.Add(1)
}
go func() { go func() {
defer util.WgFromCtx(ctx).Done() if wg != nil {
defer wg.Done()
}
// This must get closed *after* because it will not finish until // This must get closed *after* because it will not finish until
// the Watcher returns, because it contains a wg.Wait() in it... // the Watcher returns, because it contains a wg.Wait() in it...
defer c.Close() // ignore error defer c.Close() // ignore error