Fix tests and docs

hashicorp · Feb 23, 2017 · 7447ccd · 7447ccd
1 parent c80bdd9
commit 7447ccd
Show file tree

Hide file tree

Showing 3 changed files with 206 additions and 130 deletions.
diff --git a/client/task_runner.go b/client/task_runner.go
@@ -422,8 +422,6 @@ 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
-	r.setState(structs.TaskStatePending, structs.NewTaskEvent(structs.TaskSetup).
-		SetMessage(structs.TaskBuildingTaskDir))
 	if err := r.buildTaskDir(drv.FSIsolation()); err != nil {
 		e := fmt.Errorf("failed to build task directory for %q: %v", r.task.Name, err)
 		r.setState(
@@ -1206,6 +1204,9 @@ func (r *TaskRunner) buildTaskDir(fsi cstructs.FSIsolation) error {
 	}
 	r.persistLock.Unlock()
 
+	r.setState(structs.TaskStatePending, structs.NewTaskEvent(structs.TaskSetup).
+		SetMessage(structs.TaskBuildingTaskDir))
+
 	chroot := config.DefaultChrootEnv
 	if len(r.config.ChrootEnv) > 0 {
 		chroot = r.config.ChrootEnv