From 26ec29d8b246adf1fe331f52ee0fedbf39327e14 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <me@cschwarz.com>
Date: Fri, 15 Mar 2019 13:43:19 +0100
Subject: [PATCH] snapper: retry on errors during syncUp and log them

fixes #138
---
 daemon/snapper/snapper.go      | 22 +++++++++++++++++++++-
 daemon/snapper/state_string.go | 15 +++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/daemon/snapper/snapper.go b/daemon/snapper/snapper.go
index c6cc9a8..31e7b3c 100644
--- a/daemon/snapper/snapper.go
+++ b/daemon/snapper/snapper.go
@@ -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()))
diff --git a/daemon/snapper/state_string.go b/daemon/snapper/state_string.go
index 53796b0..31caf79 100644
--- a/daemon/snapper/state_string.go
+++ b/daemon/snapper/state_string.go
@@ -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) + ")"
 	}