luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #5021 from hashicorp/dani/rand-tasks 

taskrunner: Use a random suffix for Task Config
This commit is contained in:
Danielle Tomlinson 2018-12-19 00:39:55 +01:00 committed by GitHub
parent b1ab008abf 95a0c4fb29
commit 792ddc5db1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/allocrunner/taskrunner/task_runner.go
View File

@ -25,6 +25,7 @@ import (
cstructs "github.com/hashicorp/nomad/client/structs" cstructs "github.com/hashicorp/nomad/client/structs"
"github.com/hashicorp/nomad/client/taskenv" "github.com/hashicorp/nomad/client/taskenv"
"github.com/hashicorp/nomad/client/vaultclient" "github.com/hashicorp/nomad/client/vaultclient"
"github.com/hashicorp/nomad/helper/uuid"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/base"
"github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers"
@ -690,13 +691,15 @@ func (tr *TaskRunner) persistLocalState() error {
} }
// buildTaskConfig builds a drivers.TaskConfig with an unique ID for the task. // buildTaskConfig builds a drivers.TaskConfig with an unique ID for the task.
// The ID is consistently built from the alloc ID, task name and restart attempt. // The ID is unique for every invocation, it is built from the alloc ID, task
// name and 8 random characters.
func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig { func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig {
task := tr.Task() task := tr.Task()
alloc := tr.Alloc() alloc := tr.Alloc()
invocationid := uuid.Generate()[:8]
return &drivers.TaskConfig{ return &drivers.TaskConfig{
ID: fmt.Sprintf("%s/%s/%d", alloc.ID, task.Name, tr.restartTracker.GetCount()), ID: fmt.Sprintf("%s/%s/%s", alloc.ID, task.Name, invocationid),
Name: task.Name, Name: task.Name,
JobName: alloc.Job.Name, JobName: alloc.Job.Name,
Resources: &drivers.Resources{ Resources: &drivers.Resources{