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

daemon: fix data race in snapjob pruner report

Browse Source 
closes #416
This commit is contained in:
Mathias Fredriksson 2021-01-24 16:30:28 +02:00 committed by Christian Schwarz
parent 2d545c87cd
commit 48be4032a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/job/snapjob.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"sort" "sort"
"sync"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
@ -29,7 +30,8 @@ type SnapJob struct {
promPruneSecs *prometheus.HistogramVec // labels: prune_side promPruneSecs *prometheus.HistogramVec // labels: prune_side
pruner *pruner.Pruner prunerMtx sync.Mutex
pruner *pruner.Pruner
} }
func (j *SnapJob) Name() string { return j.name.String() } func (j *SnapJob) Name() string { return j.name.String() }
@ -77,9 +79,11 @@ type SnapJobStatus struct {
func (j *SnapJob) Status() *Status { func (j *SnapJob) Status() *Status {
s := &SnapJobStatus{} s := &SnapJobStatus{}
t := j.Type() t := j.Type()
j.prunerMtx.Lock()
if j.pruner != nil { if j.pruner != nil {
s.Pruning = j.pruner.Report() s.Pruning = j.pruner.Report()
} }
j.prunerMtx.Unlock()
s.Snapshotting = j.snapper.Report() s.Snapshotting = j.snapper.Report()
return &Status{Type: t, JobSpecific: s} return &Status{Type: t, JobSpecific: s}
} }
@ -177,7 +181,9 @@ func (j *SnapJob) doPrune(ctx context.Context) {
// FIXME encryption setting is irrelevant for SnapJob because the endpoint is only used as pruner.Target // FIXME encryption setting is irrelevant for SnapJob because the endpoint is only used as pruner.Target
Encrypt: &zfs.NilBool{B: true}, Encrypt: &zfs.NilBool{B: true},
}) })
j.prunerMtx.Lock()
j.pruner = j.prunerFactory.BuildLocalPruner(ctx, sender, alwaysUpToDateReplicationCursorHistory{sender}) j.pruner = j.prunerFactory.BuildLocalPruner(ctx, sender, alwaysUpToDateReplicationCursorHistory{sender})
j.prunerMtx.Unlock()
log.Info("start pruning") log.Info("start pruning")
j.pruner.Prune() j.pruner.Prune()
log.Info("finished pruning") log.Info("finished pruning")