Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
56c74b76
Commit
56c74b76
authored
Feb 19, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
8f770d3e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
go/neo/master.go
go/neo/master.go
+2
-2
go/neo/mastered.go
go/neo/mastered.go
+1
-1
go/neo/xneo/parttab.go
go/neo/xneo/parttab.go
+1
-0
No files found.
go/neo/master.go
View file @
56c74b76
...
@@ -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
...
...
go/neo/mastered.go
View file @
56c74b76
...
@@ -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
)
}
}
})
})
...
...
go/neo/xneo/parttab.go
View file @
56c74b76
...
@@ -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
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment