Commit 56c74b76 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 8f770d3e
...@@ -780,11 +780,11 @@ type storVerify struct { ...@@ -780,11 +780,11 @@ type storVerify struct {
// storCtlVerify drives a storage node during cluster verifying (= starting) state. // storCtlVerify drives a storage node during cluster verifying (= starting) state.
func storCtlVerify(ctx context.Context, stor *_MasteredPeer, pt *xneo.PartitionTable) (lastOid zodb.Oid, lastTid zodb.Tid, err error) { func storCtlVerify(ctx context.Context, stor *_MasteredPeer, pt *xneo.PartitionTable) (lastOid zodb.Oid, lastTid zodb.Tid, err error) {
// XXX cancel on ctx
slink := stor.node.Link() slink := stor.node.Link()
defer task.Runningf(&ctx, "vctl %s", stor.node.NID)(&err) defer task.Runningf(&ctx, "vctl %s", stor.node.NID)(&err)
// XXX cancel on ctx
lastOid = zodb.InvalidOid lastOid = zodb.InvalidOid
lastTid = zodb.InvalidTid lastTid = zodb.InvalidTid
......
...@@ -284,7 +284,7 @@ func (node *_MasteredNode) recvδstate(ctx context.Context, msg proto.Msg) (δpt ...@@ -284,7 +284,7 @@ func (node *_MasteredNode) recvδstate(ctx context.Context, msg proto.Msg) (δpt
case *proto.NotifyClusterState: case *proto.NotifyClusterState:
log.Infof(ctx, "<- state: %s", msg.State) log.Infof(ctx, "<- state: %s", msg.State)
node.State.Code = msg.State node.State.Code.Set(msg.State)
traceClusterStateChanged(&node.State.Code) traceClusterStateChanged(&node.State.Code)
} }
}) })
......
...@@ -260,6 +260,7 @@ func (pt *PartitionTable) Dump() []proto.RowInfo { // XXX also include .ptid? -> ...@@ -260,6 +260,7 @@ func (pt *PartitionTable) Dump() []proto.RowInfo { // XXX also include .ptid? ->
return rowv return rowv
} }
// XXX +nreplica
func PartTabFromDump(ptid proto.PTid, rowv []proto.RowInfo) *PartitionTable { func PartTabFromDump(ptid proto.PTid, rowv []proto.RowInfo) *PartitionTable {
// reconstruct partition table from response // reconstruct partition table from response
pt := &PartitionTable{} pt := &PartitionTable{}
......
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