[wip]

Author: tgross

allocrunnersim/allocrunnersim.go

@@ -160,7 +160,6 @@ func (ar *simulatedAllocRunner) Run() {
 		}
 		event.PopulateEventDisplayMessage()
 		taskStates[task.Name].Events = append(taskStates[task.Name].Events, event)
-
 		taskStates[task.Name].StartedAt = time.Now()
 		taskStates[task.Name].State = structs.TaskStateRunning
 	}
@@ -213,6 +212,7 @@ func (ar *simulatedAllocRunner) clientAlloc(taskStates map[string]*structs.TaskS
 	defer ar.allocStateLock.Unlock()
 
 	// store task states for AllocState to expose
+	taskStates = maps.Clone(taskStates)
 	ar.allocState.TaskStates = taskStates
 
 	a := &structs.Allocation{
@@ -345,7 +345,7 @@ func (ar *simulatedAllocRunner) stopAll() {
 	// Ensure we have a current copy of the task states, so that we append and
 	// create a correct and full list.
 	ar.allocStateLock.RLock()
-	taskStates := ar.allocState.TaskStates
+	taskStates := ar.allocState.Copy().TaskStates
 	ar.allocStateLock.RUnlock()
 
 	// Perform the task kill, which essentially is the shutdown notification.
@@ -360,8 +360,8 @@ func (ar *simulatedAllocRunner) stopAll() {
 		event.PopulateEventDisplayMessage()
 		taskStates[task.Name].Events = append(taskStates[task.Name].Events, event)
 	}
-	ar.updateAllocAndSendUpdate(taskStates)
 
+	ar.updateAllocAndSendUpdate(taskStates)
 	// Mark the tasks as killed and ensure the state is updated to show they
 	// are dead and finished.
 	time.Sleep(200 * time.Millisecond)
@@ -375,12 +375,10 @@ func (ar *simulatedAllocRunner) stopAll() {
 		}
 		event.PopulateEventDisplayMessage()
 		taskStates[task.Name].Events = append(taskStates[task.Name].Events, event)
-
-		ar.allocStateLock.Lock()
-		ar.allocState.TaskStates[task.Name].FinishedAt = time.Now()
-		ar.allocState.TaskStates[task.Name].State = structs.TaskStateDead
-		ar.allocStateLock.Unlock()
+		taskStates[task.Name].FinishedAt = time.Now()
+		taskStates[task.Name].State = structs.TaskStateDead
 	}
+
 	ar.updateAllocAndSendUpdate(taskStates)
 
 	ar.logger.Info("stopped all alloc-runner tasks and marked as complete")