Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
neoppod
Commits
f167c384
Commit
f167c384
authored
Feb 19, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
6baa7257
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
go/neo/mastered.go
go/neo/mastered.go
+4
-6
No files found.
go/neo/mastered.go
View file @
f167c384
...
@@ -115,7 +115,7 @@ func (node *_MasteredNode) TalkMaster(ctx context.Context, f func(context.Contex
...
@@ -115,7 +115,7 @@ func (node *_MasteredNode) TalkMaster(ctx context.Context, f func(context.Contex
node
.
mlink
=
nil
node
.
mlink
=
nil
})
})
err
:=
node
.
talkMaster1
(
ctx
,
ctx0
,
f
)
err
:=
node
.
talkMaster1
(
ctx
,
ctx0
,
f
)
log
.
Warning
(
ctx
,
err
)
// XXX Warning
ok?
-> Error?
log
.
Warning
(
ctx
,
err
)
// XXX Warning -> Error?
if
errors
.
Is
(
err
,
cmdShutdown
)
{
if
errors
.
Is
(
err
,
cmdShutdown
)
{
return
err
// M commands to shutdown
return
err
// M commands to shutdown
}
}
...
@@ -192,7 +192,6 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
...
@@ -192,7 +192,6 @@ func (node *_MasteredNode) talkMaster1(ctx, ctxPreTalkM context.Context, f func(
// keep mlink=nil on shutdown so that
// keep mlink=nil on shutdown so that
// .operational does not change to y.
// .operational does not change to y.
node
.
mlink
=
mlink
node
.
mlink
=
mlink
// XXX also set node.state.NodeTab[Mnid].link = mlink ?
// XXX also set node.state.NodeTab[Mnid].link = mlink ?
}
}
})
})
...
@@ -277,11 +276,11 @@ func (node *_MasteredNode) recvδstate(ctx context.Context, msg proto.Msg) (δpt
...
@@ -277,11 +276,11 @@ func (node *_MasteredNode) recvδstate(ctx context.Context, msg proto.Msg) (δpt
// <- δ(partTab)
// <- δ(partTab)
case
*
proto
.
NotifyPartitionChanges
:
case
*
proto
.
NotifyPartitionChanges
:
δpt
=
true
δpt
=
true
panic
(
"TODO δ(partTab)"
)
panic
(
"TODO δ(partTab)"
)
// XXX
// <- δ(nodeTab)
// <- δ(nodeTab)
case
*
proto
.
NotifyNodeInformation
:
case
*
proto
.
NotifyNodeInformation
:
err
=
node
.
updateNodeTab
(
ctx
,
msg
)
//
XXX recheck return (might be command to shutdown)
err
=
node
.
updateNodeTab
(
ctx
,
msg
)
//
err might be command to shutdown
case
*
proto
.
NotifyClusterState
:
case
*
proto
.
NotifyClusterState
:
log
.
Infof
(
ctx
,
"<- state: %s"
,
msg
.
State
)
log
.
Infof
(
ctx
,
"<- state: %s"
,
msg
.
State
)
...
@@ -377,8 +376,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN
...
@@ -377,8 +376,7 @@ func (node *_MasteredNode) updateNodeTab(ctx context.Context, msg *proto.NotifyN
if
nodeInfo
.
NID
==
node
.
MyInfo
.
NID
{
if
nodeInfo
.
NID
==
node
.
MyInfo
.
NID
{
// XXX recheck locking
// XXX recheck locking
// XXX do .myInfo = nodeInfo ?
node
.
MyInfo
=
nodeInfo
node
.
MyInfo
.
IdTime
=
nodeInfo
.
IdTime
// NEO/py currently employs this hack
// NEO/py currently employs this hack
// FIXME -> better it be separate command and handled cleanly
// FIXME -> better it be separate command and handled cleanly
...
...
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