Commit 864e62ae authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent de5ae7f0
...@@ -140,7 +140,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func( ...@@ -140,7 +140,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
NID: node.MyInfo.NID, NID: node.MyInfo.NID,
Address: node.MyInfo.Addr, Address: node.MyInfo.Addr,
ClusterName: node.ClusterName, ClusterName: node.ClusterName,
IdTime: node.MyInfo.IdTime, // XXX ok? IdTime: node.MyInfo.IdTime,
DevPath: nil, // XXX stub DevPath: nil, // XXX stub
NewNID: nil, // XXX stub NewNID: nil, // XXX stub
} }
...@@ -152,7 +152,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func( ...@@ -152,7 +152,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
return xio.WithCloseOnRetCancel(ctx, mlink, func() (err error) { return xio.WithCloseOnRetCancel(ctx, mlink, func() (err error) {
if accept.YourNID != node.MyInfo.NID { if accept.YourNID != node.MyInfo.NID {
log.Infof(ctx, "master %s told us to be %s", accept.MyNID, accept.YourNID) log.Infof(ctx, "master %s told us to be %s", accept.MyNID, accept.YourNID)
node.MyInfo.NID = accept.YourNID // XXX locking ? -> opMu ? node.MyInfo.NID = accept.YourNID
} }
// TODO verify Mnid = M*; our nid corresponds to our type // TODO verify Mnid = M*; our nid corresponds to our type
...@@ -192,7 +192,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func( ...@@ -192,7 +192,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
// keep mlink=nil on shutdown so that // keep mlink=nil on shutdown so that
// .operational does not change to y. // .operational does not change to y.
node.mlink = mlink node.mlink = mlink
// XXX also set node.state.NodeTab[Mnid].link = mlink ? // TODO also set node.state.NodeTab[Mnid].link = mlink ?
} }
}) })
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