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
b211c7b2
Commit
b211c7b2
authored
Feb 19, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
587aa7af
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
go/neo/master.go
go/neo/master.go
+6
-7
No files found.
go/neo/master.go
View file @
b211c7b2
...
@@ -354,8 +354,7 @@ type storRecovery struct {
...
@@ -354,8 +354,7 @@ type storRecovery struct {
// TODO + backup_tid, truncate_tid
// TODO + backup_tid, truncate_tid
// XXX naming cont? continue? unlock? unpause?
ack
chan
struct
{}
// main -> goStorCtlRecovery "thanks; please continue"
ack
chan
struct
{}
// main -> storCtlRecovery "thanks; please continue" XXX explain why
}
}
// recovery drives cluster during recovery phase.
// recovery drives cluster during recovery phase.
...
@@ -526,7 +525,7 @@ func (m *Master) recovery(ctx context.Context) (err error) {
...
@@ -526,7 +525,7 @@ func (m *Master) recovery(ctx context.Context) (err error) {
// a storage node came through recovery - let's see whether
// a storage node came through recovery - let's see whether
// ptid ↑ and if so we should take partition table from there
// ptid ↑ and if so we should take partition table from there
case
r
:=
<-
recoveredq
:
case
r
:=
<-
recoveredq
:
close
(
r
.
ack
)
// for <-"node leave" to happen after <-recover
y
in case of err
close
(
r
.
ack
)
// for <-"node leave" to happen after <-recover
edq
in case of err
inprogress
--
inprogress
--
if
r
.
err
!=
nil
{
if
r
.
err
!=
nil
{
...
@@ -736,7 +735,7 @@ func (m *Master) verify(ctx context.Context) (err error) {
...
@@ -736,7 +735,7 @@ func (m *Master) verify(ctx context.Context) (err error) {
//
//
// TODO actually implement logic to decide to finish/rollback transactions
// TODO actually implement logic to decide to finish/rollback transactions
case
v
:=
<-
verifiedq
:
case
v
:=
<-
verifiedq
:
close
(
v
.
ack
)
//
XXX explain why (see recovery)
close
(
v
.
ack
)
//
for <-"node leave" to happen after <-verifiedq in case of err
inprogress
--
inprogress
--
if
v
.
err
!=
nil
{
if
v
.
err
!=
nil
{
...
@@ -773,7 +772,7 @@ type storVerify struct {
...
@@ -773,7 +772,7 @@ type storVerify struct {
lastTid
zodb
.
Tid
lastTid
zodb
.
Tid
err
error
err
error
ack
chan
struct
{}
ack
chan
struct
{}
// main -> goStorCtlVerify "thanks; please continue"
}
}
// storCtlVerify drives a storage node during cluster verifying (= starting) state.
// storCtlVerify drives a storage node during cluster verifying (= starting) state.
...
@@ -832,7 +831,7 @@ type serveDone struct {
...
@@ -832,7 +831,7 @@ type serveDone struct {
peer
*
_MasteredPeer
peer
*
_MasteredPeer
err
error
err
error
ack
chan
struct
{}
ack
chan
struct
{}
// main -> goServe "thanks; please continue"
}
}
// serve drives cluster during running state.
// serve drives cluster during running state.
...
@@ -942,7 +941,7 @@ func (m *Master) serve(ctx context.Context) (err error) {
...
@@ -942,7 +941,7 @@ func (m *Master) serve(ctx context.Context) (err error) {
// serving a peer is done
// serving a peer is done
case
d
:=
<-
servedq
:
case
d
:=
<-
servedq
:
close
(
d
.
ack
)
//
XXX explain why (see recovery)
close
(
d
.
ack
)
//
for <-"node leave" to happen after <-servedq in case of err
inprogress
--
inprogress
--
if
d
.
err
!=
nil
{
if
d
.
err
!=
nil
{
...
...
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