From 6da83f1e1b1c1377b252a641e3e8f33b62bcdfda Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Sun, 13 Sep 2015 14:57:58 -0700 Subject: [PATCH] nomad: update for new AllocsFit API --- nomad/plan_apply.go | 2 +- scheduler/rank.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nomad/plan_apply.go b/nomad/plan_apply.go index 06d7b0735..ad45749cb 100644 --- a/nomad/plan_apply.go +++ b/nomad/plan_apply.go @@ -194,6 +194,6 @@ func evaluateNodePlan(snap *state.StateSnapshot, plan *structs.Plan, nodeID stri proposed = append(proposed, plan.NodeAllocation[nodeID]...) // Check if these allocations fit - fit, _, err := structs.AllocsFit(node, proposed) + fit, _, err := structs.AllocsFit(node, proposed, nil) return fit, err } diff --git a/scheduler/rank.go b/scheduler/rank.go index 38801bf0f..4ca74d835 100644 --- a/scheduler/rank.go +++ b/scheduler/rank.go @@ -214,7 +214,7 @@ OUTER: proposed = append(proposed, &structs.Allocation{Resources: total}) // Check if these allocations fit, if they do not, simply skip this node - fit, util, _ := structs.AllocsFit(option.Node, proposed) + fit, util, _ := structs.AllocsFit(option.Node, proposed, netIdx) if !fit { iter.ctx.Metrics().ExhaustedNode(option.Node) continue