Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefane Fermigier
neo
Commits
620df4c7
Commit
620df4c7
authored
Aug 31, 2017
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
67fc31dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
go/neo/client/client.go
go/neo/client/client.go
+3
-3
go/neo/server/cluster_test.go
go/neo/server/cluster_test.go
+4
-1
No files found.
go/neo/client/client.go
View file @
620df4c7
...
...
@@ -285,7 +285,8 @@ func (c *Client) recvMaster(ctx context.Context, mlink *neo.NodeLink) error {
}
// 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
)
var
opready
chan
struct
{}
...
...
@@ -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?
stor
:=
storv
[
rand
.
Intn
(
len
(
storv
))]
slink
:=
stor
.
Link
// XXX temp stub
//slink, err := stor.Link()
slink
,
err
:=
stor
.
Link
()
if
err
!=
nil
{
return
nil
,
0
,
err
// XXX err ctx
}
...
...
go/neo/server/cluster_test.go
View file @
620df4c7
...
...
@@ -416,7 +416,10 @@ func TestMasterStorage(t *testing.T) {
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment