X neo/py uses n(replica) as n(real-replica) - 1

go/neo/cluster_test.go

@@ -621,7 +621,7 @@ func TestMasterStorage(t *testing.T) {
 		NodeType:	proto.MASTER,
 		MyUUID:		proto.UUID(proto.MASTER, 1),
 		NumPartitions:	1,
-		NumReplicas:	1,
+		NumReplicas:	0,
 		YourUUID:	proto.UUID(proto.STORAGE, 1),
 	}))
 
@@ -735,7 +735,7 @@ func TestMasterStorage(t *testing.T) {
 		NodeType:	proto.MASTER,
 		MyUUID:		proto.UUID(proto.MASTER, 1),
 		NumPartitions:	1,
-		NumReplicas:	1,
+		NumReplicas:	0,
 		YourUUID:	proto.UUID(proto.CLIENT, 1),
 	}))
 
@@ -819,7 +819,7 @@ func TestMasterStorage(t *testing.T) {
 		NodeType:	proto.STORAGE,
 		MyUUID:		proto.UUID(proto.STORAGE, 1),
 		NumPartitions:	1,
-		NumReplicas:	1,
+		NumReplicas:	0,
 		YourUUID:	proto.UUID(proto.CLIENT, 1),
 	}))
 

go/neo/master.go

@@ -1082,7 +1082,7 @@ func (m *Master) identify(ctx context.Context, n nodeCome) (node *Node, resp pro
 			NodeType:	proto.MASTER,
 			MyUUID:		m.node.MyInfo.UUID,
 			NumPartitions:	1,	// FIXME hardcoded
-			NumReplicas:	1,	// FIXME hardcoded
+			NumReplicas:	0,	// FIXME hardcoded  (neo/py meaning for n(replica) is `n(real-replica) - 1`)
 			YourUUID:	uuid,
 		}
 

go/neo/nodetab.go

@@ -346,7 +346,8 @@ func (p *Node) dial(ctx context.Context) (_ *neonet.NodeLink, err error) {
 	case accept.YourUUID != app.MyInfo.UUID:
 		err = fmt.Errorf("connected, but peer gives us uuid %v (our is %v)", accept.YourUUID, app.MyInfo.UUID)
 
-	case !(accept.NumPartitions == 1 && accept.NumReplicas == 1):
+	// XXX NumReplicas: neo/py meaning for n(replica) = `n(real-replica) - 1`
+	case !(accept.NumPartitions == 1 && accept.NumReplicas == 0):
 		err = fmt.Errorf("connected but TODO peer works with !1x1 partition table.")
 	}
 

go/neo/storage.go

@@ -202,7 +202,8 @@ func (stor *Storage) talkMaster1(ctx context.Context) (err error) {
 
 	// XXX add master UUID -> nodeTab ? or master will notify us with it himself ?
 
-	if !(accept.NumPartitions == 1 && accept.NumReplicas == 1) {
+	// NumReplicas: neo/py meaning for n(replica) = `n(real-replica) - 1`
+	if !(accept.NumPartitions == 1 && accept.NumReplicas == 0) {
 		return fmt.Errorf("TODO for 1-storage POC: Npt: %v  Nreplica: %v", accept.NumPartitions, accept.NumReplicas)
 	}
 
@@ -411,7 +412,7 @@ func (stor *Storage) identify(idReq *proto.RequestIdentification) (proto.Msg, bo
 		NodeType:	stor.node.MyInfo.Type,
 		MyUUID:		stor.node.MyInfo.UUID,		// XXX lock wrt update
 		NumPartitions:	1,	// XXX
-		NumReplicas:	1,	// XXX
+		NumReplicas:	0,	// XXX
 		YourUUID:	idReq.UUID,
 	}, true
 }

go/neo/storage/sqlite/sqlite.go

@@ -463,7 +463,7 @@ func openURL(ctx context.Context, u *url.URL) (_ storage.Backend, err error) {
 	checkConfig("version",		schemaVersion)
 	checkConfig("nid",		int(proto.UUID(proto.STORAGE, 1)))
 	checkConfig("partitions",	1)
-	checkConfig("replicas",		1)
+	checkConfig("replicas",		0)	// XXX neo/py uses nreplicas as 1 + n(replica)
 
 	err = errv.Err()
 	if err != nil {

go/neo/t/neotest

@@ -266,8 +266,10 @@ neopy_log() {
 # M{py,go} ...	- spawn master
 Mpy() {
 	# --autostart=1
+	# XXX neo/py meaning for --replicas is `n(real-replica) - 1`
 	exec -a Mpy \
-		neomaster --cluster=$neocluster --bind=$Mbind --masters=$Mbind -r 1 -p 1 `neopy_log Mpy` "$@" &
+		neomaster --cluster=$neocluster --bind=$Mbind --masters=$Mbind	\
+		--replicas 0 --partitions 1 `neopy_log Mpy` "$@" &
 }
 
 Mgo() {