From 5cc91ecd7978768e42407cd7cac30d665a755714 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Fri, 4 Mar 2016 17:25:37 -0800
Subject: [PATCH] Remove outstanding reset from plan applier

---
 nomad/eval_broker.go | 5 +----
 nomad/plan_apply.go  | 8 --------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/nomad/eval_broker.go b/nomad/eval_broker.go
index be4925dbb..6e5a3ed59 100644
--- a/nomad/eval_broker.go
+++ b/nomad/eval_broker.go
@@ -78,7 +78,6 @@ type unackEval struct {
 	Eval      *structs.Evaluation
 	Token     string
 	NackTimer *time.Timer
-	Paused    bool
 }
 
 // PendingEvaluations is a list of waiting evaluations.
@@ -420,7 +419,7 @@ func (b *EvalBroker) OutstandingReset(evalID, token string) error {
 	if unack.Token != token {
 		return ErrTokenMismatch
 	}
-	if !unack.Paused && !unack.NackTimer.Reset(b.nackTimeout) {
+	if !unack.NackTimer.Reset(b.nackTimeout) {
 		return ErrNackTimeoutReached
 	}
 	return nil
@@ -526,7 +525,6 @@ func (b *EvalBroker) PauseNackTimeout(evalID, token string) error {
 	if !unack.NackTimer.Stop() {
 		return ErrNackTimeoutReached
 	}
-	unack.Paused = true
 	return nil
 }
 
@@ -543,7 +541,6 @@ func (b *EvalBroker) ResumeNackTimeout(evalID, token string) error {
 		return ErrTokenMismatch
 	}
 	unack.NackTimer.Reset(b.nackTimeout)
-	unack.Paused = false
 	return nil
 }
 
diff --git a/nomad/plan_apply.go b/nomad/plan_apply.go
index 52c575b14..5dc668f99 100644
--- a/nomad/plan_apply.go
+++ b/nomad/plan_apply.go
@@ -59,14 +59,6 @@ func (s *Server) planApply() {
 			return
 		}
 
-		// Verify the evaluation is outstanding, and that the tokens match.
-		if err := s.evalBroker.OutstandingReset(pending.plan.EvalID, pending.plan.EvalToken); err != nil {
-			s.logger.Printf("[ERR] nomad: plan rejected for evaluation %s: %v",
-				pending.plan.EvalID, err)
-			pending.respond(nil, err)
-			continue
-		}
-
 		// Check if out last plan has completed
 		select {
 		case <-waitCh: