.

go/neo/proto.go

@@ -230,7 +230,6 @@ func float64_NEODecode(b []byte) float64 {
 }
 
 // NodeInfo is information about a node
-// XXX -> nodetab.go ?
 type NodeInfo struct {
 	Type		NodeType
 	Addr		Address		// serving address
@@ -239,7 +238,6 @@ type NodeInfo struct {
 	IdTimestamp	float64	// FIXME clarify semantic where it is used
 }
 
-// XXX -> parttab.go ?
 type CellInfo struct {
 	NodeUUID
 	CellState

go/neo/server/cluster_test.go

@@ -48,6 +48,7 @@ import (
 	"lab.nexedi.com/kirr/go123/exc"
 
 	"fmt"
+	"time"
 )
 
 // XXX dup from connection_test
@@ -296,8 +297,9 @@ func TestMasterStorage(t *testing.T) {
 
 	// XXX M.partTab <- S1
 
-	// verification
+	// M starts verification
 	tc.Expect(clusterState(&M.clusterState, neo.ClusterVerifying))
+
 	tc.Expect(conntx("m:2", "s:2", 1, &neo.NotifyPartitionTable{
 		PTid:		1,
 		RowList:	[]neo.RowInfo{
@@ -305,6 +307,12 @@ func TestMasterStorage(t *testing.T) {
 		},
 	}))
 
+	tc.Expect(conntx("m:2", "s:2", 1, &neo.LockedTransactions{}))
+
+	tc.Expect(conntx("s:2", "m:2", 1, &neo.AnswerLockedTransactions{
+		TidDict: nil,	// map[zodb.Tid]zodb.Tid{},
+	}))
+
 
 	// expect:
 	// ? M -> S ClusterInformation(VERIFICATION)
@@ -337,7 +345,9 @@ func TestMasterStorage(t *testing.T) {
 	// TODO test M.recovery starting back from verification/service
 	// (M needs to resend to all storages recovery messages just from start)
 
+	time.Sleep(100*time.Millisecond) // XXX temp so net tx'ers could actually tx
 	return
+
 	Mcancel()	// FIXME ctx cancel not fully handled
 	Scancel()	// ---- // ----
 	xwait(gwg)

go/neo/server/master.go

@@ -458,7 +458,7 @@ loop2:
 	// recovery successful - we are starting
 
 	// S PENDING -> RUNNING
-	// XXX recheck logic is ok for starting existing cluster
+	// XXX recheck logic is ok for when starting existing cluster
 	for _, stor := range m.nodeTab.StorageList() {
 		if stor.State == neo.PENDING {
 			m.nodeTab.SetNodeState(stor, neo.RUNNING)