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
7c804efa
Commit
7c804efa
authored
Feb 19, 2021
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
b88b9916
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
2 deletions
+21
-2
go/neo/master.go
go/neo/master.go
+21
-2
No files found.
go/neo/master.go
View file @
7c804efa
...
@@ -531,7 +531,12 @@ func (m *Master) recovery(ctx context.Context) (err error) {
...
@@ -531,7 +531,12 @@ func (m *Master) recovery(ctx context.Context) (err error) {
inprogress
--
inprogress
--
if
r
.
err
!=
nil
{
if
r
.
err
!=
nil
{
// log error if it is not caused by verify cancel
// TODO -> xxcontext.Canceled(err) but currently err is
// "...: use of closed network connection"
if
ctx
.
Err
()
==
nil
{
log
.
Error
(
ctx
,
r
.
err
)
log
.
Error
(
ctx
,
r
.
err
)
}
}
else
{
}
else
{
// we are interested in latest partTab
// we are interested in latest partTab
// NOTE during recovery no one must be subscribed to
// NOTE during recovery no one must be subscribed to
...
@@ -736,7 +741,12 @@ func (m *Master) verify(ctx context.Context) (err error) {
...
@@ -736,7 +741,12 @@ func (m *Master) verify(ctx context.Context) (err error) {
inprogress
--
inprogress
--
if
v
.
err
!=
nil
{
if
v
.
err
!=
nil
{
// log error if it is not caused by verify cancel
// TODO -> xxcontext.Canceled(err) but currently err is
// "...: use of closed network connection"
if
ctx
.
Err
()
==
nil
{
log
.
Error
(
ctx
,
v
.
err
)
log
.
Error
(
ctx
,
v
.
err
)
}
// check partTab is still operational
// check partTab is still operational
// if not -> cancel to go back to recovery
// if not -> cancel to go back to recovery
...
@@ -935,6 +945,15 @@ func (m *Master) serve(ctx context.Context) (err error) {
...
@@ -935,6 +945,15 @@ func (m *Master) serve(ctx context.Context) (err error) {
case
d
:=
<-
servedq
:
case
d
:=
<-
servedq
:
close
(
d
.
ack
)
// XXX explain why (see recovery)
close
(
d
.
ack
)
// XXX explain why (see recovery)
inprogress
--
inprogress
--
if
d
.
err
!=
nil
{
// log error if it is not caused by verify cancel
// TODO -> xxcontext.Canceled(err) but currently err is
// "...: use of closed network connection"
if
ctx
.
Err
()
==
nil
{
log
.
Error
(
ctx
,
d
.
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