Commit 65c31e09 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent f73fc1ce
...@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment