Commit 7e2c82e1 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 635ba959
......@@ -117,10 +117,7 @@ func (c *Client) Run(ctx context.Context) (err error) {
defer cancel()
return c.node.TalkMaster(ctx, func(ctx context.Context, mlink *_MasterLink) error {
// XXX errctx ("on redial"? "connected"?)
c.head0 = c.head
wg := xsync.NewWorkGroup(ctx)
// launch master notifications receiver
......@@ -129,7 +126,7 @@ func (c *Client) Run(ctx context.Context) (err error) {
})
// sync lastTid with master
// TODO better change protocol for master to send us head via notify
// TODO better change protocol for master to send us head right after accept
// channel right after identification.
wg.Go(func(ctx context.Context) error {
return c.syncMaster(ctx, mlink)
......@@ -324,7 +321,7 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
}
if len(storv) == 0 {
// XXX recheck it adds traceback to log -> XXX it does not -> add our Bugf which always forces +v on such error print
// XXX add our Bugf which always forces +v (traceback) on such error print ?
return nil, 0, errors.Errorf("internal inconsistency: cluster is operational, but no storages alive for oid %s", xid.Oid)
}
......@@ -335,7 +332,7 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
slink, err := stor.Dial(ctx)
if err != nil {
return nil, 0, err // XXX err ctx
return nil, 0, err
}
// close accept after dialed (not to deadlock if S decides to send us
// something).
......@@ -354,7 +351,7 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
if e, ok := err.(*proto.Error); ok {
err = proto.ZODBErrDecode(e)
}
return nil, 0, err // XXX err context
return nil, 0, err
}
buf = resp.Data
......
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