engine: resources, graph: Change the done channel into a ctx

This is part one of porting Watch to context.
This commit is contained in:
James Shubin
2023-08-07 19:44:41 -04:00
parent 5eac48094b
commit 53a878bf61
34 changed files with 73 additions and 66 deletions

View File

@@ -99,8 +99,7 @@ func (obj *ConfigEtcdRes) Watch() error {
obj.wg.Add(1)
defer obj.wg.Done()
// FIXME: add timeout to context
// The obj.init.Done channel is closed by the engine to signal shutdown.
ctx, cancel := util.ContextWithCloser(context.Background(), obj.init.Done)
ctx, cancel := context.WithCancel(obj.init.DoneCtx)
defer cancel()
ch, err := obj.init.World.IdealClusterSizeWatch(util.CtxWithWg(ctx, obj.wg))
if err != nil {
@@ -121,7 +120,7 @@ Loop:
}
// pass through and send an event
case <-obj.init.Done: // closed by the engine to signal shutdown
case <-obj.init.DoneCtx.Done(): // closed by the engine to signal shutdown
}
obj.init.Event() // notify engine of an event (this can block)