extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-12-23 07:28:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Inlined a couple legacy leftover functions from the mode copypasta

Browse Source
This commit is contained in:
InsanePrawn 2018-11-21 14:35:40 +01:00
parent b79ad3ddc3
commit e9564a7e5c
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daemon/job/snapjob.go
View File

@ -28,21 +28,8 @@ type SnapJob struct {
func (j *SnapJob) Name() string { return j.name } func (j *SnapJob) Name() string { return j.name }
func (j *SnapJob) getPruner(ctx context.Context, sender *endpoint.Sender) *pruner.Pruner {
p := j.prunerFactory.BuildSinglePruner(ctx, sender, sender)
return p
}
func (j *SnapJob) Type() Type { return TypeSnap } func (j *SnapJob) Type() Type { return TypeSnap }
func (j *SnapJob) RunPeriodic(ctx context.Context, wakeUpCommon chan<- struct{}) {
j.snapper.Run(ctx, wakeUpCommon)
}
func (j *SnapJob) FSFilter() zfs.DatasetFilter {
return j.fsfilter
}
func snapJob(g *config.Global, in *config.SnapJob) (j *SnapJob, err error) { func snapJob(g *config.Global, in *config.SnapJob) (j *SnapJob, err error) {
j = &SnapJob{} j = &SnapJob{}
fsf, err := filters.DatasetMapFilterFromConfig(in.Filesystems) fsf, err := filters.DatasetMapFilterFromConfig(in.Filesystems)
@ -95,7 +82,7 @@ func (j *SnapJob) Run(ctx context.Context) {
periodicDone := make(chan struct{}) periodicDone := make(chan struct{})
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
defer cancel() defer cancel()
go j.RunPeriodic(ctx, periodicDone) go j.snapper.Run(ctx, periodicDone)
invocationCount := 0 invocationCount := 0
outer: outer:
@ -118,8 +105,8 @@ outer:
func (j *SnapJob) doPrune(ctx context.Context) { func (j *SnapJob) doPrune(ctx context.Context) {
log := GetLogger(ctx) log := GetLogger(ctx)
ctx = logging.WithSubsystemLoggers(ctx, log) ctx = logging.WithSubsystemLoggers(ctx, log)
sender := endpoint.NewSender(j.FSFilter()) sender := endpoint.NewSender(j.fsfilter)
j.pruner = j.getPruner(ctx, sender) j.pruner = j.prunerFactory.BuildSinglePruner(ctx, sender, sender)
log.Info("start pruning") log.Info("start pruning")
j.pruner.Prune() j.pruner.Prune()
log.Info("finished pruning") log.Info("finished pruning")