Commit e88063c9 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 081210a3
...@@ -308,7 +308,7 @@ func (m *Master) main(ctx context.Context) (err error) { ...@@ -308,7 +308,7 @@ func (m *Master) main(ctx context.Context) (err error) {
// a command came to us to start the cluster. // a command came to us to start the cluster.
err := m.recovery(ctx) err := m.recovery(ctx)
if err != nil { if err != nil {
log.Error(ctx, err) // do not log - the error is returned up
return err // recovery cancelled return err // recovery cancelled
} }
log.Infof(ctx, "recovered ok; partTab:\n%s", m.node.State.PartTab) log.Infof(ctx, "recovered ok; partTab:\n%s", m.node.State.PartTab)
...@@ -855,7 +855,7 @@ func (m *Master) serve(ctx context.Context) (err error) { ...@@ -855,7 +855,7 @@ func (m *Master) serve(ctx context.Context) (err error) {
case proto.CLIENT: case proto.CLIENT:
err = m.serveClient(ctx, peer) err = m.serveClient(ctx, peer)
// XXX ADMIN // XXX ADMIN, MASTER
default: default:
err = fmt.Errorf("TODO: serve %s", peer.node.Type) err = fmt.Errorf("TODO: serve %s", peer.node.Type)
} }
......
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