From bb22cf7ebe3b10a29f05df8e2174bf4c8ceb87a0 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Sun, 13 Sep 2015 17:35:56 -0700 Subject: [PATCH] client: Use Alloc.TaskResouces to override Task.Resources --- client/alloc_runner.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/alloc_runner.go b/client/alloc_runner.go index 336479ce1..79b2579c3 100644 --- a/client/alloc_runner.go +++ b/client/alloc_runner.go @@ -288,6 +288,10 @@ func (r *AllocRunner) Run() { if _, ok := r.tasks[task.Name]; ok { continue } + + // Merge in the task resources + task.Resources = alloc.TaskResources[task.Name] + tr := NewTaskRunner(r.logger, r.config, r.setTaskStatus, r.ctx, r.alloc.ID, task) r.tasks[task.Name] = tr go tr.Run() @@ -309,6 +313,9 @@ OUTER: r.taskLock.RLock() for _, task := range tg.Tasks { tr := r.tasks[task.Name] + + // Merge in the task resources + task.Resources = update.TaskResources[task.Name] tr.Update(task) } r.taskLock.RUnlock()