.

go/neo/client.go

@@ -262,7 +262,9 @@ func (c *Client) flushEventq0() {
 
 // Sync implements zodb.IStorageDriver.
 func (c *Client) Sync(ctx context.Context) (head zodb.Tid, err error) {
-	ctx = taskctx.Runningf(ctx, "%s: zsync", c.node.MyInfo.NID) // XXX mynid locking
+	c.WithState/*XXX Snapshot ?*/(func(s *xneo.State) {
+		ctx = taskctx.Runningf(ctx, "%s: zsync", s.MyNID)
+	})
 	if glog.V(2) {
 		task.TraceBegin(ctx)
 		defer func() { task.TraceEnd(ctx, err) }()
@@ -273,7 +275,7 @@ func (c *Client) Sync(ctx context.Context) (head zodb.Tid, err error) {
 		}
 	}()
 
-	err = c.node.WithOperationalState(ctx, func(mlink *neonet.NodeLink, _ *xneo.ClusterState) error {
+	err = c.node.WithOperationalState(ctx, func(mlink *neonet.NodeLink, _ *xneo.State) error {
 		// XXX mlink can become down while we are making the call.
 		// XXX do we want to return error or retry?
 		reply := proto.AnswerLastTransaction{}
@@ -289,7 +291,9 @@ func (c *Client) Sync(ctx context.Context) (head zodb.Tid, err error) {
 
 // Load implements zodb.IStorageDriver.
 func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial zodb.Tid, err error) {
-	ctx = taskctx.Runningf(ctx, "%s: zload %s", c.node.MyInfo.NID, xid) // XXX mynid locking
+	c.WithState(func(s *xneo.State) {
+		ctx = taskctx.Runningf(ctx, "%s: zload %s", s.MyNID, xid)
+	})
 	if glog.V(2) {
 		task.TraceBegin(ctx)
 		defer func() { task.TraceEnd(ctx, err) }()
@@ -302,10 +306,10 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
 
 	// Retrieve storages we might need to access.
 	storv := make([]*xneo.PeerNode, 0, 1)
-	err = c.node.WithOperationalState(ctx, func(mlink *neonet.NodeLink, cs *xneo.ClusterState) error {
-		for _, cell := range cs.PartTab.Get(xid.Oid) {
+	err = c.node.WithOperationalState(ctx, func(mlink *neonet.NodeLink, s *xneo.State) error {
+		for _, cell := range s.PartTab.Get(xid.Oid) {
 			if cell.Readable() {
-				stor := cs.NodeTab.Get(cell.NID)
+				stor := s.NodeTab.Get(cell.NID)
 				// this storage might not yet come up
 				if stor != nil && stor.State == proto.RUNNING {
 					storv = append(storv, stor)

go/neo/mastered.go

@@ -154,7 +154,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
 	return xio.WithCloseOnRetCancel(ctx, mlink, func() (err error) {
 		if accept.YourNID != node.MyInfo.NID {
 			log.Infof(ctx, "master %s told us to be %s", accept.MyNID, accept.YourNID)
-			node.MyInfo.NID = accept.YourNID
+			node.MyInfo.NID = accept.YourNID // XXX .updateState
 		}
 
 		// TODO verify Mnid = M*; our nid corresponds to our type
@@ -187,7 +187,7 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
 		}
 
 		// update cluster state
-		node.updateOperational(func() {
+		node.updateOperational(func() {	// XXX -> updateState
 			err = node.updateNodeTab(ctx, &mnt) // the only err is cmdShutdown
 			node.State.PartTab = pt
 			if err == nil {
@@ -391,7 +391,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN
 		// TODO .State = DOWN -> ResetLink
 
 		if nodeInfo.NID == node.MyInfo.NID {
-			// XXX recheck locking
+			// XXX recheck locking		-> under .updateState
 			node.MyInfo = nodeInfo
 
 			// NEO/py currently employs this hack

go/neo/xneo/xneo.go

@@ -31,7 +31,7 @@ import (
 
 // NodeState represent state maintained on a Node.
 type NodeState struct {
-	NID     proto.NodeID // nid received by node from M
+	NID     proto.NodeID // nid received by node from M XXX -> MasteredState ? (because .mlink is there ?)
 	IdTime  proto.IdTime // when this node last identified to master
 
 	NodeTab      *NodeTable         // nodes in the cluster
@@ -105,7 +105,7 @@ func (cs *ClusterState) Snapshot() *ClusterStateSnapshot {
 // - current cluster state.
 type Node struct {
 //	MyInfo      proto.NodeInfo // type, laddr, nid, state, idtime	XXX nid is managed by M
-	MyState     NodeState
+	State       NodeState
 	// XXX type, laddr
 	ClusterName string
 	Net         xnet.Networker // network AP we are sending/receiving on
@@ -122,22 +122,19 @@ type Node struct {
 // NewNode creates new node.
 func NewNode(typ proto.NodeType, clusterName string, net xnet.Networker, masterAddr string) *Node {
 	node := &Node{
-		MyInfo:	proto.NodeInfo{
-			Type:   typ,
-			Addr:   proto.Address{},
+		State {
 			NID:    proto.NID(typ, 0), // temp, e.g. S?  TODO use "temp" bit in NodeID
 			IdTime: proto.IdTimeNone,
-		},
+
+			NodeTab:      &NodeTable{},
+			PartTab:      &PartitionTable{},
+			ClusterState: -1, // invalid
+		}
+
 		ClusterName: clusterName,
 
 		Net:        net,
 		MasterAddr: masterAddr,
-
-		State: ClusterState{
-			NodeTab: &NodeTable{},
-			PartTab: &PartitionTable{},
-			Code:    -1, // invalid
-		},
 	}
 
 	node.State.NodeTab.localNode = node