pruner + proto change: better handling of missing replication cursor

- don't treat missing replication cursor as an error in protocol
- treat it as a per-fs planning error instead
This commit is contained in:
Christian Schwarz
2018-11-16 12:03:38 +01:00
parent 5e1ea21f85
commit 3472145df6
5 changed files with 80 additions and 75 deletions
+1 -6
View File
@@ -463,16 +463,11 @@ func (s *ReplicationStep) doMarkReplicated(ctx context.Context, ka *watchdog.Kee
},
},
}
res, err := sender.ReplicationCursor(ctx, req)
_, err := sender.ReplicationCursor(ctx, req)
if err != nil {
log.WithError(err).Error("error advancing replication cursor")
return err
}
if res.GetError() != "" {
err := fmt.Errorf("cannot advance replication cursor: %s", res.GetError())
log.Error(err.Error())
return err
}
ka.MadeProgress()
s.state = StepCompleted