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
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
23de320c
Commit
23de320c
authored
Feb 18, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
34b85fe0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
go/neo/master.go
go/neo/master.go
+3
-5
No files found.
go/neo/master.go
View file @
23de320c
...
@@ -44,7 +44,6 @@ import (
...
@@ -44,7 +44,6 @@ import (
"context"
"context"
"errors"
"errors"
"fmt"
"fmt"
// "sync"
"time"
"time"
xxcontext
"lab.nexedi.com/kirr/go123/xcontext"
xxcontext
"lab.nexedi.com/kirr/go123/xcontext"
...
@@ -790,8 +789,7 @@ type storVerify struct {
...
@@ -790,8 +789,7 @@ type storVerify struct {
// storCtlVerify drives a storage node during cluster verifying (= starting) state.
// storCtlVerify drives a storage node during cluster verifying (= starting) state.
func
storCtlVerify
(
ctx
context
.
Context
,
stor
*
_MasteredPeer
,
pt
*
xneo
.
PartitionTable
)
(
lastOid
zodb
.
Oid
,
lastTid
zodb
.
Tid
,
err
error
)
{
func
storCtlVerify
(
ctx
context
.
Context
,
stor
*
_MasteredPeer
,
pt
*
xneo
.
PartitionTable
)
(
lastOid
zodb
.
Oid
,
lastTid
zodb
.
Tid
,
err
error
)
{
// XXX link.Close on err -> = xcontext.WithCloseOnErrCancel
// XXX cancel on ctx
// XXX cancel on ctx -> = ^^^
slink
:=
stor
.
node
.
Link
()
slink
:=
stor
.
node
.
Link
()
defer
task
.
Runningf
(
&
ctx
,
"%s verify"
,
stor
.
node
.
NID
)(
&
err
)
defer
task
.
Runningf
(
&
ctx
,
"%s verify"
,
stor
.
node
.
NID
)(
&
err
)
...
@@ -992,7 +990,7 @@ func storCtlServe(ctx context.Context, stor *_MasteredPeer) (err error) {
...
@@ -992,7 +990,7 @@ func storCtlServe(ctx context.Context, stor *_MasteredPeer) (err error) {
// now wait in a loop
// now wait in a loop
//
XXX
this should be also controlling transactions
//
TODO
this should be also controlling transactions
for
{
for
{
select
{
select
{
// XXX stub
// XXX stub
...
@@ -1011,7 +1009,7 @@ func (m *Master) serveClient(ctx context.Context, cli *_MasteredPeer) (err error
...
@@ -1011,7 +1009,7 @@ func (m *Master) serveClient(ctx context.Context, cli *_MasteredPeer) (err error
defer
task
.
Runningf
(
&
ctx
,
"%s: serve client"
,
cli
.
node
.
NID
)(
&
err
)
defer
task
.
Runningf
(
&
ctx
,
"%s: serve client"
,
cli
.
node
.
NID
)(
&
err
)
clink
:=
cli
.
node
.
Link
()
clink
:=
cli
.
node
.
Link
()
defer
xio
.
CloseWhenDone
(
ctx
,
clink
)()
// XXX -> cli.ResetLink? (better not here)
defer
xio
.
CloseWhenDone
(
ctx
,
clink
)()
// M <- C requests handler
// M <- C requests handler
for
{
for
{
...
...
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