Merge pull request #3001 from hashicorp/f-template-events

Template emits events explaining why it is blocked

api/tasks.go

@@ -506,6 +506,7 @@ const (
 	TaskRestartSignal          = "Restart Signaled"
 	TaskLeaderDead             = "Leader Task Dead"
 	TaskBuildingTaskDir        = "Building Task Directory"
+	TaskGenericMessage         = "Generic"
 )
 
 // TaskEvent is an event that effects the state of a task and contains meta-data
@@ -533,4 +534,5 @@ type TaskEvent struct {
 	VaultError       string
 	TaskSignalReason string
 	TaskSignal       string
+	GenericSource    string
 }

client/alloc_runner.go

@@ -620,9 +620,10 @@ func (r *AllocRunner) setStatus(status, desc string) {
 	}
 }
 
-// setTaskState is used to set the status of a task. If state is empty then the
-// event is appended but not synced with the server. The event may be omitted
-func (r *AllocRunner) setTaskState(taskName, state string, event *structs.TaskEvent) {
+// setTaskState is used to set the status of a task. If lazySync is set then the
+// event is appended but not synced with the server. If state is omitted, the
+// last known state is used.
+func (r *AllocRunner) setTaskState(taskName, state string, event *structs.TaskEvent, lazySync bool) {
 	r.taskStatusLock.Lock()
 	defer r.taskStatusLock.Unlock()
 	taskState, ok := r.taskStates[taskName]
@@ -643,10 +644,18 @@ func (r *AllocRunner) setTaskState(taskName, state string, event *structs.TaskEv
 		r.appendTaskEvent(taskState, event)
 	}
 
-	if state == "" {
+	if lazySync {
 		return
 	}
 
+	// If the state hasn't been set use the existing state.
+	if state == "" {
+		state = taskState.State
+		if taskState.State == "" {
+			state = structs.TaskStatePending
+		}
+	}
+
 	switch state {
 	case structs.TaskStateRunning:
 		// Capture the start time if it is just starting