Commit 620df4c7 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 67fc31dd
...@@ -285,7 +285,8 @@ func (c *Client) recvMaster(ctx context.Context, mlink *neo.NodeLink) error { ...@@ -285,7 +285,8 @@ func (c *Client) recvMaster(ctx context.Context, mlink *neo.NodeLink) error {
} }
// update .operational + notify those who was waiting for it // update .operational + notify those who was waiting for it
operational := c.node.ClusterState == neo.ClusterRunning && // XXX py client does not wait for cluster state = running
operational := // c.node.ClusterState == neo.ClusterRunning &&
c.node.PartTab.OperationalWith(c.node.NodeTab) c.node.PartTab.OperationalWith(c.node.NodeTab)
var opready chan struct{} var opready chan struct{}
...@@ -398,8 +399,7 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (data []byte, serial zo ...@@ -398,8 +399,7 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (data []byte, serial zo
// retry from the beginning if all are found to fail? // retry from the beginning if all are found to fail?
stor := storv[rand.Intn(len(storv))] stor := storv[rand.Intn(len(storv))]
slink := stor.Link // XXX temp stub slink, err := stor.Link()
//slink, err := stor.Link()
if err != nil { if err != nil {
return nil, 0, err // XXX err ctx return nil, 0, err // XXX err ctx
} }
......
...@@ -416,7 +416,10 @@ func TestMasterStorage(t *testing.T) { ...@@ -416,7 +416,10 @@ func TestMasterStorage(t *testing.T) {
Tid: lastTid, Tid: lastTid,
})) }))
// C starts loading first object xwait(wg)
println("000")
// C starts loading first object -> connects to S
data, serial, err := C.Load(bg, zodb.Xid{Oid: 1, XTid: zodb.XTid{Tid: zodb.TidMax, TidBefore: true}}) data, serial, err := C.Load(bg, zodb.Xid{Oid: 1, XTid: zodb.XTid{Tid: zodb.TidMax, TidBefore: true}})
_, _, _ = data, serial, err _, _, _ = data, serial, err
......
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