Commit 5cc06ec3 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent fd1d1a5a
...@@ -204,19 +204,13 @@ func (m *Master) setClusterState(ctx context.Context, state proto.ClusterState) ...@@ -204,19 +204,13 @@ func (m *Master) setClusterState(ctx context.Context, state proto.ClusterState)
// //
// The master will be serving incoming connections on l. // The master will be serving incoming connections on l.
func (m *Master) Run(ctx context.Context, l xnet.Listener) (err error) { func (m *Master) Run(ctx context.Context, l xnet.Listener) (err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel() // so that .runCtx is canceled if we return due to an error
// XXX ^^^ not needed - we first must wait for all spawned subtasks
mynid := m.allocNID(proto.MASTER) mynid := m.allocNID(proto.MASTER)
addr := l.Addr() addr := l.Addr()
defer task.Runningf(&ctx, "%s", mynid)(&err) defer task.Runningf(&ctx, "%s", mynid)(&err)
log.Infof(ctx, "listening on %s ...", addr) log.Infof(ctx, "listening on %s ...", addr)
m.runCtx = ctx m.runCtx = ctx
m.mainWG = xsync.NewWorkGroup(m.runCtx) m.mainWG = xsync.NewWorkGroup(m.runCtx)
// update our master & serving address in node // update our master & serving address in node
naddr, err := proto.Addr(addr) naddr, err := proto.Addr(addr)
if err != nil { if err != nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment