kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 19:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move path building to task dir initialization

Browse Source
This commit is contained in:
Michael Schurter
2017-05-18 10:49:39 -07:00
parent ace00980a1
commit 3b24980680
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
client/task_runner.go
View File

@@ -501,26 +501,6 @@ func (r *TaskRunner) createDriver() (driver.Driver, error) {
r.task.Driver, r.alloc.ID, err)
}
// Set driver-specific environment variables
switch d.FSIsolation() {
case cstructs.FSIsolationNone:
// Use host paths
r.envBuilder.SetAllocDir(r.taskDir.SharedAllocDir)
r.envBuilder.SetTaskLocalDir(r.taskDir.LocalDir)
r.envBuilder.SetSecretsDir(r.taskDir.SecretsDir)
default:
// filesystem isolation; use container paths
r.envBuilder.SetAllocDir(allocdir.SharedAllocContainerPath)
r.envBuilder.SetTaskLocalDir(allocdir.TaskLocalContainerPath)
r.envBuilder.SetSecretsDir(allocdir.TaskSecretsContainerPath)
}
// Set the host environment variables for non-image based drivers
if d.FSIsolation() != cstructs.FSIsolationImage {
filter := strings.Split(r.config.ReadDefault("env.blacklist", config.DefaultEnvBlacklist), ",")
r.envBuilder.SetHostEnvvars(filter)
}
return d, err
}
@@ -537,8 +517,10 @@ func (r *TaskRunner) Run() {
return
}
// Create a driver so that we can determine the FSIsolation required
drv, err := r.createDriver()
// Create a temporary driver so that we can determine the FSIsolation
// required. run->startTask will create a new driver after environment
// has been setup (env vars, templates, artifacts, secrets, etc).
tmpDrv, err := r.createDriver()
if err != nil {
e := fmt.Errorf("failed to create driver of task %q for alloc %q: %v", r.task.Name, r.alloc.ID, err)
r.setState(
@@ -550,7 +532,7 @@ func (r *TaskRunner) Run() {
// Build base task directory structure regardless of FS isolation abilities.
// This needs to happen before we start the Vault manager and call prestart
// as both those can write to the task directories
if err := r.buildTaskDir(drv.FSIsolation()); err != nil {
if err := r.buildTaskDir(tmpDrv.FSIsolation()); err != nil {
e := fmt.Errorf("failed to build task directory for %q: %v", r.task.Name, err)
r.setState(
structs.TaskStateDead,
@@ -1467,6 +1449,26 @@ func (r *TaskRunner) buildTaskDir(fsi cstructs.FSIsolation) error {
r.persistLock.Lock()
r.taskDirBuilt = true
r.persistLock.Unlock()
// Set driver-specific environment variables
switch fsi {
case cstructs.FSIsolationNone:
// Use host paths
r.envBuilder.SetAllocDir(r.taskDir.SharedAllocDir)
r.envBuilder.SetTaskLocalDir(r.taskDir.LocalDir)
r.envBuilder.SetSecretsDir(r.taskDir.SecretsDir)
default:
// filesystem isolation; use container paths
r.envBuilder.SetAllocDir(allocdir.SharedAllocContainerPath)
r.envBuilder.SetTaskLocalDir(allocdir.TaskLocalContainerPath)
r.envBuilder.SetSecretsDir(allocdir.TaskSecretsContainerPath)
}
// Set the host environment variables for non-image based drivers
if fsi != cstructs.FSIsolationImage {
filter := strings.Split(r.config.ReadDefault("env.blacklist", config.DefaultEnvBlacklist), ",")
r.envBuilder.SetHostEnvvars(filter)
}
return nil
}