Commit 4bedfba7 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 6409111e
...@@ -127,7 +127,6 @@ func newMasteredNode(typ proto.NodeType, clusterName string, net xnet.Networker, ...@@ -127,7 +127,6 @@ func newMasteredNode(typ proto.NodeType, clusterName string, net xnet.Networker,
} }
// TalkMaster dials master, identifies to it, and receives master notifications and requests. // TalkMaster dials master, identifies to it, and receives master notifications and requests.
// //
// Notifications to node/partition tables and cluster state are automatically // Notifications to node/partition tables and cluster state are automatically
...@@ -161,8 +160,10 @@ func (node *_MasteredNode) TalkMaster(ctx context.Context, f func(context.Contex ...@@ -161,8 +160,10 @@ func (node *_MasteredNode) TalkMaster(ctx context.Context, f func(context.Contex
}) })
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 ok? -> Error?
// TODO if err == "reject identification / protocol error" -> shutdown client if errors.Is(err, cmdShutdown) {
// TODO if err == shutdown -> return return err // M commands to shutdown
}
// TODO if err == "reject identification / protocol error" -> shutdown client?
// TODO if err == "not a primary" -> try redirected address // TODO if err == "not a primary" -> try redirected address
// exit on cancel / throttle reconnecting // exit on cancel / throttle reconnecting
...@@ -445,7 +446,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN ...@@ -445,7 +446,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN
} }
} }
// FIXME logging under lock ok? (if caller took e.g. .opMu before applying updates) // XXX logging under lock ok? (if caller took e.g. .opMu before applying updates)
log.Infof(ctx, "full nodetab:\n%s", node.state.NodeTab) log.Infof(ctx, "full nodetab:\n%s", node.state.NodeTab)
return nil return 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