.

go/neo/client/client.go

@@ -22,6 +22,7 @@ package client
 
 import (
 	"context"
+	"math/rand"
 	"net/url"
 
 	"lab.nexedi.com/kirr/neo/go/neo"
@@ -43,8 +44,6 @@ func (c *Client) StorageName() string {
 	return "neo"
 }
 
-// XXX loading cache (+ singleflight)
-
 // NewClient creates new client node.
 // it will connect to master @masterAddr and identify with sepcified cluster name
 func NewClient(clusterName, masterAddr string, net xnet.Networker) (*Client, error) {
@@ -60,7 +59,7 @@ func NewClient(clusterName, masterAddr string, net xnet.Networker) (*Client, err
 		},
 	}
 
-	// XXX -> background
+	// XXX -> talkMaster
 	cli.node.Dial(context.TODO(), neo.MASTER, masterAddr)
 	panic("TODO")
 }
@@ -101,9 +100,23 @@ func (c *Client) LastOid() (zodb.Oid, error) {
 }
 
 func (c *Client) Load(xid zodb.Xid) (data []byte, tid zodb.Tid, err error) {
-	panic("TODO")
-/*
-	// FIXME do not use global conn (see comment in openClientByURL)
+	// XXX check pt is operational first?
+	cellv := c.node.PartTab.Get(xid.Oid)
+	// XXX cellv = filter(cellv, UP_TO_DATE)
+	cell := cellv[rand.Intn(len(cellv))]
+	stor := c.node.NodeTab.Get(cell.NodeUUID)
+	if stor == nil {
+		// XXX?
+	}
+	//Slink := c.Connect(stor) // single-flight Dial; puts result into stor.Link (XXX ok?)
+	Slink := stor.Connect() // single-flight Dial; puts result into stor.Link (XXX ok?)
+
+	// TODO maintain conn pool so every new GetObject request does not
+	// spawn new goroutine on server
+	// Sconn = stor.GetConn()
+	// XXX defer if ok stor.PutConn(Sconn)
+	Sconn := Slink.NewConn()
+
 	req := neo.GetObject{Oid: xid.Oid}
 	if xid.TidBefore {
 		req.Serial = neo.INVALID_TID
@@ -114,7 +127,7 @@ func (c *Client) Load(xid zodb.Xid) (data []byte, tid zodb.Tid, err error) {
 	}
 
 	resp := neo.AnswerGetObject{}
-	err = c.storConn.Ask(&req, &resp)
+	err = Sconn.Ask(&req, &resp)
 	if err != nil {
 		return nil, 0, err	// XXX err context
 	}
@@ -125,7 +138,6 @@ func (c *Client) Load(xid zodb.Xid) (data []byte, tid zodb.Tid, err error) {
 	// reply.NextSerial
 	// reply.DataSerial
 	return resp.Data, resp.Serial, nil
-*/
 }
 
 func (c *Client) Iterate(tidMin, tidMax zodb.Tid) zodb.IStorageIterator {

go/neo/nodetab.go

@@ -101,7 +101,7 @@ type Node struct {
 }
 
 
-// Get finds node by uuid
+// Get finds node by uuid.
 func (nt *NodeTable) Get(uuid NodeUUID) *Node {
 	// FIXME linear scan
 	for _, node := range nt.nodev {
@@ -114,7 +114,8 @@ func (nt *NodeTable) Get(uuid NodeUUID) *Node {
 
 // XXX GetByAddress ?
 
-// Update updates information about a node
+// Update updates information about a node.
+//
 // it returns corresponding node entry for convenience
 func (nt *NodeTable) Update(nodeInfo NodeInfo, conn *Conn /*XXX better link *NodeLink*/) *Node {
 	node := nt.Get(nodeInfo.UUID)

go/neo/parttab.go

@@ -136,7 +136,7 @@ type Cell struct {
 //
 }
 
-// Get returns cells oid is associated with
+// Get returns cells oid is associated with.
 func (pt *PartitionTable) Get(oid zodb.Oid) []Cell {
 	if len(pt.tab) == 0 {
 		return nil

go/xcommon/xcontext/xcontext.go

@@ -45,6 +45,37 @@ func Merge(ctx1, ctx2 context.Context) (context.Context, context.CancelFunc) {
 		done:     make(chan struct{}),
 		cancelCh: make(chan struct{}),
 	}
+
+/*
+	// ctx1 will never be canceled?
+	switch ctx1.Done() {
+	case nil, context.Background().Done():
+		bg1 = true
+	}
+	// ----//---- same for ctx2?
+*/
+
+
+/*
+	XXX do we need vvv?
+
+	// if src ctx is already cancelled - make mc cancelled right after creation
+	select {
+	case <-ctx1.Done():
+		mc.done = ctx1.Done()
+		mc.doneErr = ctx1.Err()
+	case <-ctx2.Done():
+		mc.done = ctx2.Done()
+		mc.doneErr = ctx2.Err()
+
+	// src ctx not canceled - spawn ctx{1,2}.done merger.
+	default:
+		done := make(chan struct{})
+		mc.done = done
+		go mc.wait(done)
+	}
+*/
+
 	go mc.wait()
 	return mc, mc.cancel
 }
@@ -124,6 +155,7 @@ func (mc *mergeCtx) Value(key interface{}) interface{} {
 	return mc.ctx2.Value(key)
 }
 
+
 // Cancelled reports whether an error is due to a canceled context.
 //
 // Since both cancellation ways - explicit and due to exceeding context