Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
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
Levin Zimmermann
neoppod
Commits
0800ed58
Commit
0800ed58
authored
4 years ago
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
5d5a4372
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
go/neo/client.go
go/neo/client.go
+5
-5
go/neo/xneo/xneo.go
go/neo/xneo/xneo.go
+0
-1
No files found.
go/neo/client.go
View file @
0800ed58
...
...
@@ -322,7 +322,7 @@ func (c *Client) talkMaster1(ctx context.Context) (err error) {
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
// channel right after identification.
wg
.
Go
(
func
()
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
)
if
err
!=
nil
{
return
0
,
err
...
...
@@ -553,9 +553,9 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
if
err
!=
nil
{
return
nil
,
0
,
err
// XXX err ctx
}
// close accept after
really dialed (not to deadlock if S decides to
// s
end us s
omething).
slink
.
CloseAccept
()
// XXX need to close only after
really dialed
// close accept after
dialed (not to deadlock if S decides to send us
// something).
slink
.
CloseAccept
()
// XXX need to close only after
first real dial
// on the wire it comes as "before", not "at"
req
:=
proto
.
GetObject
{
...
...
This diff is collapsed.
Click to expand it.
go/neo/xneo/xneo.go
View file @
0800ed58
...
...
@@ -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.YourNID // XXX M can tell us to change NID -> take in effect
// XXX accept.NumPartitions, ... wrt app.node.PartTab
log
.
Info
(
ctx
,
"identification accepted"
)
return
link
,
accept
,
nil
...
...
This diff is collapsed.
Click to expand it.
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