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
65c31e09
Commit
65c31e09
authored
Feb 18, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
f73fc1ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
go/neo/storage.go
go/neo/storage.go
+2
-5
No files found.
go/neo/storage.go
View file @
65c31e09
...
@@ -81,7 +81,7 @@ func (stor *Storage) Run(ctx context.Context, l xnet.Listener) (err error) {
...
@@ -81,7 +81,7 @@ func (stor *Storage) Run(ctx context.Context, l xnet.Listener) (err error) {
// update our serving address in node
// update our serving address in node
naddr
,
err
:=
proto
.
Addr
(
addr
)
naddr
,
err
:=
proto
.
Addr
(
addr
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
// XXX + errctx ?
return
fmt
.
Errorf
(
"run @%s: %s"
,
addr
,
err
)
}
}
stor
.
node
.
MyInfo
.
Addr
=
naddr
stor
.
node
.
MyInfo
.
Addr
=
naddr
...
@@ -224,7 +224,7 @@ func (stor *Storage) m1serve(ctx context.Context, mlink *_MasterLink, reqStart *
...
@@ -224,7 +224,7 @@ func (stor *Storage) m1serve(ctx context.Context, mlink *_MasterLink, reqStart *
defer
serveCancel
()
defer
serveCancel
()
// reply M we are ready
// reply M we are ready
//
XXX
NEO/py sends NotifyReady on another conn; we patched py: see
//
NOTE
NEO/py sends NotifyReady on another conn; we patched py: see
// https://lab.nexedi.com/kirr/neo/commit/4eaaf186 for context.
// https://lab.nexedi.com/kirr/neo/commit/4eaaf186 for context.
err
=
reqStart
.
Reply
(
&
proto
.
NotifyReady
{})
err
=
reqStart
.
Reply
(
&
proto
.
NotifyReady
{})
reqStart
.
Close
()
reqStart
.
Close
()
...
@@ -373,9 +373,6 @@ func (stor *Storage) serveLink(ctx context.Context, req *neonet.Request, idReq *
...
@@ -373,9 +373,6 @@ func (stor *Storage) serveLink(ctx context.Context, req *neonet.Request, idReq *
}
}
// serveClient serves incoming client request.
// serveClient serves incoming client request.
//
// XXX version that reuses goroutine to serve next client requests
// XXX for py compatibility (py has no way to tell us Conn is closed)
func
(
stor
*
Storage
)
serveClient
(
ctx
context
.
Context
,
req
neonet
.
Request
)
error
{
func
(
stor
*
Storage
)
serveClient
(
ctx
context
.
Context
,
req
neonet
.
Request
)
error
{
link
:=
req
.
Link
()
link
:=
req
.
Link
()
...
...
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