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
367842e1
Commit
367842e1
authored
Feb 05, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
f793d3da
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
go/neo/master.go
go/neo/master.go
+2
-1
go/neo/storage.go
go/neo/storage.go
+2
-1
No files found.
go/neo/master.go
View file @
367842e1
...
...
@@ -891,7 +891,8 @@ func storCtlService(ctx context.Context, stor *xneo.PeerNode) (err error) {
defer
task
.
Runningf
(
&
ctx
,
"%s: stor service"
,
slink
.
RemoteAddr
())(
&
err
)
// XXX current neo/py does StartOperation / NotifyReady as separate
// sends, not exchange on the same conn. - py draftly fixed in 4eaaf186.
// sends, not exchange on the same conn. - py draftly fixed: see
// https://lab.nexedi.com/kirr/neo/commit/4eaaf186 for context.
ready
:=
proto
.
NotifyReady
{}
err
=
slink
.
Ask1
(
&
proto
.
StartOperation
{
Backup
:
false
},
&
ready
)
//err = slink.Send1(&proto.StartOperation{Backup: false})
...
...
go/neo/storage.go
View file @
367842e1
...
...
@@ -265,7 +265,8 @@ func (stor *Storage) m1serve(ctx context.Context, mlink *_MasterLink, reqStart *
defer
opCancel
()
// reply M we are ready
// XXX NEO/py sends NotifyReady on another conn; we patched py: see 4eaaf186 for context
// XXX NEO/py sends NotifyReady on another conn; we patched py: see
// https://lab.nexedi.com/kirr/neo/commit/4eaaf186 for context.
err
=
reqStart
.
Reply
(
&
proto
.
NotifyReady
{})
reqStart
.
Close
()
if
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