Commit a6935abb authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 01bae9f2
......@@ -33,7 +33,7 @@ import (
"sync"
"time"
"golang.org/x/sync/errgroup"
// "golang.org/x/sync/errgroup"
"lab.nexedi.com/kirr/go123/xnet"
......@@ -941,19 +941,18 @@ func (m *Master) serveClient(ctx context.Context, cli *xneo.PeerNode) (err error
clink := cli.Link()
defer task.Runningf(&ctx, "%s: client service", clink.RemoteAddr())(&err)
wg, ctx := errgroup.WithContext(ctx) // XXX -> sync.WorkGroup
// wg, ctx := errgroup.WithContext(ctx) // XXX -> sync.WorkGroup
defer xio.CloseWhenDone(ctx, clink)() // XXX -> cli.ResetLink? (better not here)
// FIXME send initial nodeTab and partTab before starting serveClient1
// (move those initial sends from keepPeerUpdated to .accept)
/* XXX kill
// M -> C notifications about cluster state
wg.Go(func() error {
return m.keepPeerUpdated(ctx, clink)
})
*/
// M <- C requests handler
wg.Go(func() error {
// wg.Go(func() error {
for {
req, err := clink.Recv1()
if err != nil {
......@@ -967,9 +966,9 @@ func (m *Master) serveClient(ctx context.Context, cli *xneo.PeerNode) (err error
return err
}
}
})
return wg.Wait()
// })
//
// return wg.Wait()
}
// serveClient1 prepares response for 1 request from client.
......
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