extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-04-29 05:49:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the references to a pruning 'side' in the singlepruner logging code and the snapjob prometheus thing.

Browse Source
This commit is contained in:
InsanePrawn 2018-11-21 02:52:33 +01:00
parent 141e49727c
commit 7de3c0a09a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/job/snapjob.go
View File

@ -21,7 +21,7 @@ type SnapJob struct {
prunerFactory *pruner.SinglePrunerFactory prunerFactory *pruner.SinglePrunerFactory
promPruneSecs *prometheus.HistogramVec // labels: prune_side promPruneSecs *prometheus.HistogramVec // no labels!
pruner *pruner.Pruner pruner *pruner.Pruner
} }
@ -63,7 +63,7 @@ func snapJob(g *config.Global, in *config.SnapJob) (j *SnapJob, err error) {
Name: "time", Name: "time",
Help: "seconds spent in pruner", Help: "seconds spent in pruner",
ConstLabels: prometheus.Labels{"zrepl_job":j.name}, ConstLabels: prometheus.Labels{"zrepl_job":j.name},
}, []string{"prune_side"}) }, []string {})
j.prunerFactory, err = pruner.NewSinglePrunerFactory(in.Pruning, j.promPruneSecs) j.prunerFactory, err = pruner.NewSinglePrunerFactory(in.Pruning, j.promPruneSecs)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "cannot build snapjob pruning rules") return nil, errors.Wrap(err, "cannot build snapjob pruning rules")

4
daemon/pruner/pruner.go
View File

@ -181,13 +181,13 @@ func (f *PrunerFactory) BuildReceiverPruner(ctx context.Context, target Target,
func (f *SinglePrunerFactory) BuildSinglePruner(ctx context.Context, target Target, receiver History) *Pruner { func (f *SinglePrunerFactory) BuildSinglePruner(ctx context.Context, target Target, receiver History) *Pruner {
p := &Pruner{ p := &Pruner{
args: args{ args: args{
WithLogger(ctx, GetLogger(ctx).WithField("prune_side", "sender")), ctx,
target, target,
receiver, receiver,
f.keepRules, f.keepRules,
f.retryWait, f.retryWait,
f.considerSnapAtCursorReplicated, f.considerSnapAtCursorReplicated,
f.promPruneSecs.WithLabelValues("sender"), f.promPruneSecs.WithLabelValues(),
}, },
state: Plan, state: Plan,
} }