From 82889c432ee03b70eae2793b346bc565e9b7568f Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Fri, 21 Sep 2018 16:55:35 -0700
Subject: [PATCH] Denormalize jobs in plan and ignore resources of terminal
 allocs

Denormalize jobs in AppendAllocs:
AppendAlloc was originally only ever called for inplace upgrades and new
allocations. Both these code paths would remove the job from the
allocation. Now we use this to also add fields such as FollowupEvalID
which did not normalize the job. This is only a performance enhancement.

Ignore terminal allocs:
Failed allocations are annotated with the followup Eval ID when one is
created to replace the failed allocation. However, in the plan applier,
when we check if allocations fit, these terminal allocations were not
filtered. This could result in the plan being rejected if the node would
be overcommited if the terminal allocations resources were considered.
---
 nomad/structs/funcs.go   | 5 +++++
 nomad/structs/structs.go | 4 ++++
 nomad/worker.go          | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nomad/structs/funcs.go b/nomad/structs/funcs.go
index 91298c97b..5ace4bc8c 100644
--- a/nomad/structs/funcs.go
+++ b/nomad/structs/funcs.go
@@ -111,6 +111,11 @@ func AllocsFit(node *Node, allocs []*Allocation, netIdx *NetworkIndex) (bool, st
 
 	// For each alloc, add the resources
 	for _, alloc := range allocs {
+		// Do not consider the resource impact of terminal allocations
+		if alloc.TerminalStatus() {
+			continue
+		}
+
 		if alloc.Resources != nil {
 			if err := used.Add(alloc.Resources); err != nil {
 				return false, "", nil, err
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
index 1588cc101..68fd8d529 100644
--- a/nomad/structs/structs.go
+++ b/nomad/structs/structs.go
@@ -7138,6 +7138,10 @@ func (p *Plan) PopUpdate(alloc *Allocation) {
 func (p *Plan) AppendAlloc(alloc *Allocation) {
 	node := alloc.NodeID
 	existing := p.NodeAllocation[node]
+
+	// Normalize the job
+	alloc.Job = nil
+
 	p.NodeAllocation[node] = append(existing, alloc)
 }
 
diff --git a/nomad/worker.go b/nomad/worker.go
index b6bab0bbc..911f4ee3a 100644
--- a/nomad/worker.go
+++ b/nomad/worker.go
@@ -326,7 +326,7 @@ SUBMIT:
 		}
 		return nil, nil, err
 	} else {
-		w.logger.Debug("submitted plan for evaluation", "plan_resp_index", resp.Index, "eval_id", plan.EvalID)
+		w.logger.Debug("submitted plan for evaluation", "eval_id", plan.EvalID)
 		w.backoffReset()
 	}