extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-06-22 18:51:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove snapMode, rename snap_ActiveSide to SnapJob

Browse Source
This commit is contained in:
InsanePrawn 2018-11-21 01:54:56 +01:00
parent 1265cc7934
commit 19d0916e34
2 changed files with 29 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/job/build_jobs.go
View File

@ -46,11 +46,7 @@ func buildJob(c *config.Global, in config.JobEnum) (j Job, err error) {
return cannotBuildJob(err, v.Name) return cannotBuildJob(err, v.Name)
} }
case *config.SnapJob: case *config.SnapJob:
m, err := modeSnapFromConfig(c, v) j, err = snapJob(c, v)
if err != nil {
return cannotBuildJob(err, v.Name)
}
j, err = snap_activeSide(c, v, m)
if err != nil { if err != nil {
return cannotBuildJob(err, v.Name) return cannotBuildJob(err, v.Name)
} }

76
daemon/job/snapjob.go
View File

@ -18,9 +18,10 @@ import (
"time" "time"
) )
type snap_ActiveSide struct { type SnapJob struct {
mode snap_activeMode
name string name string
fsfilter zfs.DatasetFilter
snapper *snapper.PeriodicOrManual
prunerFactory *pruner.SinglePrunerFactory prunerFactory *pruner.SinglePrunerFactory
@ -39,70 +40,49 @@ type snap_activeSideTasks struct {
prunerCancel context.CancelFunc prunerCancel context.CancelFunc
} }
func (a *snap_ActiveSide) Name() string { return a.name } func (j *SnapJob) Name() string { return j.name }
func (a *snap_ActiveSide) GetPruner(ctx context.Context, sender *endpoint.Sender) (*pruner.Pruner) { func (j *SnapJob) GetPruner(ctx context.Context, sender *endpoint.Sender) (*pruner.Pruner) {
p := a.prunerFactory.BuildSinglePruner(ctx,sender,sender) p := j.prunerFactory.BuildSinglePruner(ctx,sender,sender)
return p return p
} }
func (a *snap_ActiveSide) updateTasks(u func(*snap_activeSideTasks)) snap_activeSideTasks { func (j *SnapJob) updateTasks(u func(*snap_activeSideTasks)) snap_activeSideTasks {
a.tasksMtx.Lock() j.tasksMtx.Lock()
defer a.tasksMtx.Unlock() defer j.tasksMtx.Unlock()
var copy snap_activeSideTasks var copy snap_activeSideTasks
copy = a.tasks copy = j.tasks
if u == nil { if u == nil {
return copy return copy
} }
u(&copy) u(&copy)
a.tasks = copy j.tasks = copy
return copy return copy
} }
type snap_activeMode interface { func (j *SnapJob) Type() Type { return TypeSnap }
Type() Type
RunPeriodic(ctx context.Context, wakeUpCommon chan<- struct{}) func (j *SnapJob) RunPeriodic(ctx context.Context, wakeUpCommon chan <- struct{}) {
FSFilter() zfs.DatasetFilter j.snapper.Run(ctx, wakeUpCommon)
} }
func (j *SnapJob) FSFilter() zfs.DatasetFilter {
return j.fsfilter
type modeSnap struct {
fsfilter zfs.DatasetFilter
snapper *snapper.PeriodicOrManual
} }
func (m *modeSnap) Type() Type { return TypeSnap } func snapJob(g *config.Global, in *config.SnapJob) (j *SnapJob, err error) {
j = &SnapJob{}
func (m *modeSnap) RunPeriodic(ctx context.Context, wakeUpCommon chan <- struct{}) {
m.snapper.Run(ctx, wakeUpCommon)
}
func (m *modeSnap) FSFilter() zfs.DatasetFilter {
return m.fsfilter
}
func modeSnapFromConfig(g *config.Global, in *config.SnapJob) (*modeSnap, error) {
m := &modeSnap{}
fsf, err := filters.DatasetMapFilterFromConfig(in.Filesystems) fsf, err := filters.DatasetMapFilterFromConfig(in.Filesystems)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "cannnot build filesystem filter") return nil, errors.Wrap(err, "cannnot build filesystem filter")
} }
m.fsfilter = fsf j.fsfilter = fsf
if m.snapper, err = snapper.FromConfig(g, fsf, in.Snapshotting); err != nil { if j.snapper, err = snapper.FromConfig(g, fsf, in.Snapshotting); err != nil {
return nil, errors.Wrap(err, "cannot build snapper") return nil, errors.Wrap(err, "cannot build snapper")
} }
return m, nil
}
func snap_activeSide(g *config.Global, in *config.SnapJob, mode *modeSnap) (j *snap_ActiveSide, err error) {
j = &snap_ActiveSide{mode: mode}
j.name = in.Name j.name = in.Name
j.promPruneSecs = prometheus.NewHistogramVec(prometheus.HistogramOpts{ j.promPruneSecs = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: "zrepl", Namespace: "zrepl",
@ -118,22 +98,22 @@ func snap_activeSide(g *config.Global, in *config.SnapJob, mode *modeSnap) (j *s
return j, nil return j, nil
} }
func (j *snap_ActiveSide) RegisterMetrics(registerer prometheus.Registerer) { func (j *SnapJob) RegisterMetrics(registerer prometheus.Registerer) {
registerer.MustRegister(j.promPruneSecs) registerer.MustRegister(j.promPruneSecs)
} }
func (j *snap_ActiveSide) Status() *Status { func (j *SnapJob) Status() *Status {
tasks := j.updateTasks(nil) tasks := j.updateTasks(nil)
s := &ActiveSideStatus{} s := &ActiveSideStatus{}
t := j.mode.Type() t := j.Type()
if tasks.pruner != nil { if tasks.pruner != nil {
s.PruningSender = tasks.pruner.Report() s.PruningSender = tasks.pruner.Report()
} }
return &Status{Type: t, JobSpecific: s} return &Status{Type: t, JobSpecific: s}
} }
func (j *snap_ActiveSide) Run(ctx context.Context) { func (j *SnapJob) Run(ctx context.Context) {
log := GetLogger(ctx) log := GetLogger(ctx)
ctx = logging.WithSubsystemLoggers(ctx, log) ctx = logging.WithSubsystemLoggers(ctx, log)
@ -142,7 +122,7 @@ func (j *snap_ActiveSide) 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.mode.RunPeriodic(ctx, periodicDone) go j.RunPeriodic(ctx, periodicDone)
invocationCount := 0 invocationCount := 0
outer: outer:
@ -162,7 +142,7 @@ outer:
} }
} }
func (j *snap_ActiveSide) do(ctx context.Context) { func (j *SnapJob) do(ctx context.Context) {
log := GetLogger(ctx) log := GetLogger(ctx)
ctx = logging.WithSubsystemLoggers(ctx, log) ctx = logging.WithSubsystemLoggers(ctx, log)
@ -236,7 +216,7 @@ func (j *snap_ActiveSide) do(ctx context.Context) {
}() }()
ctx, localCancel := context.WithCancel(ctx) ctx, localCancel := context.WithCancel(ctx)
sender := endpoint.NewSender(j.mode.FSFilter()) sender := endpoint.NewSender(j.FSFilter())
tasks := j.updateTasks(func(tasks *snap_activeSideTasks) { tasks := j.updateTasks(func(tasks *snap_activeSideTasks) {
tasks.pruner = j.GetPruner(ctx, sender) tasks.pruner = j.GetPruner(ctx, sender)
tasks.prunerCancel = localCancel tasks.prunerCancel = localCancel