Merge pull request #5737 from fwkz/fix-restart-attempts

Fix restart attempts of `restart` stanza in `delay` mode.
hashicorp · Jun 5, 2019 · d9ac7c2 · d9ac7c2
2 parents 8ba7e52 + e2d793c
commit d9ac7c2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/client/allocrunner/taskrunner/restarts/restarts.go b/client/allocrunner/taskrunner/restarts/restarts.go
@@ -169,8 +169,6 @@ func (r *RestartTracker) GetState() (string, time.Duration) {
 		return structs.TaskNotRestarting, 0
 	}
 
-	r.count++
-
 	// Check if we have entered a new interval.
 	end := r.startTime.Add(r.policy.Interval)
 	now := time.Now()
@@ -179,6 +177,8 @@ func (r *RestartTracker) GetState() (string, time.Duration) {
 		r.startTime = now
 	}
 
+	r.count++
+
 	// Handle restarts due to failures
 	if !r.failure {
 		return "", 0