mirror of
https://github.com/kemko/nomad.git
synced 2026-01-09 03:45:41 +03:00
client: Use Alloc.TaskResouces to override Task.Resources
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user