From b79ad3ddc3570497822c083c135641ec3cca816b Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Wed, 21 Nov 2018 14:17:38 +0100 Subject: [PATCH] Honour PruneKeepNotReplicated.KeepSnashotAtCursor in SinglePrunerFactory --- daemon/pruner/pruner.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/daemon/pruner/pruner.go b/daemon/pruner/pruner.go index 9446dd1..1e7fc8e 100644 --- a/daemon/pruner/pruner.go +++ b/daemon/pruner/pruner.go @@ -108,6 +108,13 @@ func NewSinglePrunerFactory(in config.PruningLocal, promPruneSecs *prometheus.Hi return nil, errors.Wrap(err, "cannot build pruning rules") } considerSnapAtCursorReplicated := false + for _, r := range in.Keep { + knr, ok := r.Ret.(*config.PruneKeepNotReplicated) + if !ok { + continue + } + considerSnapAtCursorReplicated = considerSnapAtCursorReplicated || !knr.KeepSnapshotAtCursor + } f := &SinglePrunerFactory{ keepRules: rules, retryWait: envconst.Duration("ZREPL_PRUNER_RETRY_INTERVAL", 10 * time.Second),