extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-12-22 15:11:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pruner: single: remove unused member considerSnapAtCursorReplicated

Browse Source
This commit is contained in:
Christian Schwarz 2019-03-17 20:57:34 +01:00
parent e8c0d206ea
commit d8d9e34914
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon/pruner/pruner.go
View File

@ -82,9 +82,8 @@ type PrunerFactory struct {
}
type SinglePrunerFactory struct {
keepRules []pruning.KeepRule
retryWait time.Duration
considerSnapAtCursorReplicated bool
keepRules []pruning.KeepRule
retryWait time.Duration
promPruneSecs *prometheus.HistogramVec
}
@ -106,18 +105,16 @@ func NewSinglePrunerFactory(in config.PruningLocal, promPruneSecs *prometheus.Hi
if err != nil {
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
if _, ok := r.Ret.(*config.PruneKeepNotReplicated); ok {
// rule NotReplicated for a local pruner doesn't make sense
// because no replication happens with that job type
return nil, fmt.Errorf("single-site pruner cannot support `not_replicated` keep rule")
}
considerSnapAtCursorReplicated = considerSnapAtCursorReplicated || !knr.KeepSnapshotAtCursor
}
f := &SinglePrunerFactory{
keepRules: rules,
retryWait: envconst.Duration("ZREPL_PRUNER_RETRY_INTERVAL", 10 * time.Second),
considerSnapAtCursorReplicated: considerSnapAtCursorReplicated,
keepRules: rules,
retryWait: envconst.Duration("ZREPL_PRUNER_RETRY_INTERVAL", 10*time.Second),
promPruneSecs: promPruneSecs,
}
return f, nil
@ -192,7 +189,7 @@ func (f *SinglePrunerFactory) BuildSinglePruner(ctx context.Context, target Targ
receiver,
f.keepRules,
f.retryWait,
f.considerSnapAtCursorReplicated,
false, // considerSnapAtCursorReplicated is not relevant for local pruning
f.promPruneSecs.WithLabelValues("local"),
},
state: Plan,