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

Merge branch 'problame/138-snapshotter-fails-silently' into 'master'

Browse Source 
closes #152
This commit is contained in:
Christian Schwarz 2019-03-22 10:59:58 +01:00
commit 9a2d1b3074
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/snapper/snapper.go
View File

@ -71,6 +71,7 @@ type State uint
const (
SyncUp State = 1<<iota
SyncUpErrWait
Planning
Snapshotting
Waiting
@ -81,6 +82,7 @@ const (
func (s State) sf() state {
m := map[State]state{
SyncUp: syncUp,
SyncUpErrWait: wait,
Planning: plan,
Snapshotting: snapshot,
Waiting: wait,
@ -165,7 +167,16 @@ func (s *Snapper) Run(ctx context.Context, snapshotsTaken chan<- struct{}) {
func onErr(err error, u updater) state {
return u(func(s *Snapper) {
s.err = err
s.state = ErrorWait
preState := s.state
switch s.state {
case SyncUp:
s.state = SyncUpErrWait
case Planning:
fallthrough
case Snapshotting:
s.state = ErrorWait
}
s.args.log.WithError(err).WithField("pre_state", preState).WithField("post_state", s.state).Error("snapshotting error")
}).sf()
}
@ -177,6 +188,9 @@ func onMainCtxDone(ctx context.Context, u updater) state {
}
func syncUp(a args, u updater) state {
u(func(snapper *Snapper) {
snapper.lastInvocation = time.Now()
})
fss, err := listFSes(a.ctx, a.fsf)
if err != nil {
return onErr(err, u)
@ -284,6 +298,12 @@ func wait(a args, u updater) state {
lastTick := snapper.lastInvocation
snapper.sleepUntil = lastTick.Add(a.interval)
sleepUntil = snapper.sleepUntil
log := a.log.WithField("sleep_until", sleepUntil).WithField("duration", a.interval)
logFunc := log.Debug
if snapper.state == ErrorWait || snapper.state == SyncUpErrWait {
logFunc = log.Error
}
logFunc("enter wait-state after error")
})
t := time.NewTimer(sleepUntil.Sub(time.Now()))

15
daemon/snapper/state_string.go
View File

@ -5,15 +5,16 @@ package snapper
import "strconv"
const (
_State_name_0 = "SyncUpPlanning"
_State_name_1 = "Snapshotting"
_State_name_2 = "Waiting"
_State_name_3 = "ErrorWait"
_State_name_4 = "Stopped"
_State_name_0 = "SyncUpSyncUpErrWait"
_State_name_1 = "Planning"
_State_name_2 = "Snapshotting"
_State_name_3 = "Waiting"
_State_name_4 = "ErrorWait"
_State_name_5 = "Stopped"
)
var (
_State_index_0 = [...]uint8{0, 6, 14}
_State_index_0 = [...]uint8{0, 6, 19}
)
func (i State) String() string {
@ -29,6 +30,8 @@ func (i State) String() string {
return _State_name_3
case i == 32:
return _State_name_4
case i == 64:
return _State_name_5
default:
return "State(" + strconv.FormatInt(int64(i), 10) + ")"
}