Commit 7c804efa authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent b88b9916
...@@ -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)
}
}
} }
} }
......
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