Commit f167c384 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 6baa7257
...@@ -115,7 +115,7 @@ func (node *_MasteredNode) TalkMaster(ctx context.Context, f func(context.Contex ...@@ -115,7 +115,7 @@ func (node *_MasteredNode) TalkMaster(ctx context.Context, f func(context.Contex
node.mlink = nil node.mlink = nil
}) })
err := node.talkMaster1(ctx, ctx0, f) err := node.talkMaster1(ctx, ctx0, f)
log.Warning(ctx, err) // XXX Warning ok? -> Error? log.Warning(ctx, err) // XXX Warning -> Error?
if errors.Is(err, cmdShutdown) { if errors.Is(err, cmdShutdown) {
return err // M commands to shutdown return err // M commands to shutdown
} }
...@@ -192,7 +192,6 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func( ...@@ -192,7 +192,6 @@ 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 ? // XXX also set node.state.NodeTab[Mnid].link = mlink ?
} }
}) })
...@@ -277,11 +276,11 @@ func (node *_MasteredNode) recvδstate(ctx context.Context, msg proto.Msg) (δpt ...@@ -277,11 +276,11 @@ func (node *_MasteredNode) recvδstate(ctx context.Context, msg proto.Msg) (δpt
// <- δ(partTab) // <- δ(partTab)
case *proto.NotifyPartitionChanges: case *proto.NotifyPartitionChanges:
δpt = true δpt = true
panic("TODO δ(partTab)") panic("TODO δ(partTab)") // XXX
// <- δ(nodeTab) // <- δ(nodeTab)
case *proto.NotifyNodeInformation: case *proto.NotifyNodeInformation:
err = node.updateNodeTab(ctx, msg) // XXX recheck return (might be command to shutdown) err = node.updateNodeTab(ctx, msg) // err might be command to shutdown
case *proto.NotifyClusterState: case *proto.NotifyClusterState:
log.Infof(ctx, "<- state: %s", msg.State) log.Infof(ctx, "<- state: %s", msg.State)
...@@ -377,8 +376,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN ...@@ -377,8 +376,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN
if nodeInfo.NID == node.MyInfo.NID { if nodeInfo.NID == node.MyInfo.NID {
// XXX recheck locking // XXX recheck locking
// XXX do .myInfo = nodeInfo ? node.MyInfo = nodeInfo
node.MyInfo.IdTime = nodeInfo.IdTime
// NEO/py currently employs this hack // NEO/py currently employs this hack
// FIXME -> better it be separate command and handled cleanly // FIXME -> better it be separate command and handled cleanly
......
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