Commit 0800ed58 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 5d5a4372
...@@ -322,7 +322,7 @@ func (c *Client) talkMaster1(ctx context.Context) (err error) { ...@@ -322,7 +322,7 @@ func (c *Client) talkMaster1(ctx context.Context) (err error) {
return c.recvMaster(ctx, mlink) return c.recvMaster(ctx, mlink)
}) })
// init partition table and lastTid from master // init lastTid from master
// TODO better change protocol for master to send us head via notify // TODO better change protocol for master to send us head via notify
// channel right after identification. // channel right after identification.
wg.Go(func() error { wg.Go(func() error {
...@@ -495,7 +495,7 @@ func (c *Client) Sync(ctx context.Context) (_ zodb.Tid, err error) { ...@@ -495,7 +495,7 @@ func (c *Client) Sync(ctx context.Context) (_ zodb.Tid, err error) {
} }
}() }()
// XXX or require full withOperational ? // FIXME require full withOperational ? ->
mlink, err := c.masterLink(ctx) mlink, err := c.masterLink(ctx)
if err != nil { if err != nil {
return 0, err return 0, err
...@@ -553,9 +553,9 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z ...@@ -553,9 +553,9 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
if err != nil { if err != nil {
return nil, 0, err // XXX err ctx return nil, 0, err // XXX err ctx
} }
// close accept after really dialed (not to deadlock if S decides to // close accept after dialed (not to deadlock if S decides to send us
// send us something). // something).
slink.CloseAccept() // XXX need to close only after really dialed slink.CloseAccept() // XXX need to close only after first real dial
// on the wire it comes as "before", not "at" // on the wire it comes as "before", not "at"
req := proto.GetObject{ req := proto.GetObject{
......
...@@ -148,7 +148,6 @@ func (app *NodeApp) Dial(ctx context.Context, peerType proto.NodeType, addr stri ...@@ -148,7 +148,6 @@ func (app *NodeApp) Dial(ctx context.Context, peerType proto.NodeType, addr stri
// XXX accept.MyNID, link // XXX register .NodeTab? no -> LinkTab as NodeTab is driven by M // XXX accept.MyNID, link // XXX register .NodeTab? no -> LinkTab as NodeTab is driven by M
// XXX accept.YourNID // XXX M can tell us to change NID -> take in effect // XXX accept.YourNID // XXX M can tell us to change NID -> take in effect
// XXX accept.NumPartitions, ... wrt app.node.PartTab
log.Info(ctx, "identification accepted") log.Info(ctx, "identification accepted")
return link, accept, nil return link, accept, nil
......
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