minor fixes

Author: lgfa29

client/allocrunner/taskrunner/task_runner.go

@@ -518,10 +518,10 @@ func (tr *TaskRunner) Run() {
 	runComplete := tr.localState.RunComplete
 	tr.stateLock.RUnlock()
 
-	// If restoring a dead task, ensure that task is cleared and all post hooks
-	// are called without additional state updates.
-	// If the alloc is not terminal we must proceed until the ALLOC_RESTART
-	// loop to allow the task to run again in case the alloc is restarted.
+	// If restoring a dead task, ensure the task is cleared and, if the local
+	// state indicates that the previous Run() call is complete, execute all
+	// post stop hooks and exit early, otherwise proceed until the
+	// ALLOC_RESTART loop skipping MAIN since the task is dead.
 	if dead {
 		// do cleanup functions without emitting any additional events/work
 		// to handle cases where we restored a dead task where client terminated
@@ -686,7 +686,7 @@ MAIN:
 	tr.UpdateState(structs.TaskStateDead, nil)
 
 	// Wait here in case the allocation is restarted. Poststop tasks will never
-	// run again so, skip them to avoid blocking forever.
+	// run again so skip them to avoid blocking forever.
 	if !tr.Task().IsPoststop() {
 	ALLOC_RESTART:
 		// Run in a loop to handle cases where restartCh is triggered but the

client/allocrunner/taskrunner/task_runner_test.go

@@ -398,7 +398,7 @@ func TestTaskRunner_Restore_Dead(t *testing.T) {
 	// Retry a few times as the newTR.Run() may not have started yet.
 	testutil.WaitForResult(func() (bool, error) {
 		ev := &structs.TaskEvent{Type: structs.TaskRestartSignal}
-		err = newTR.Rerun(context.Background(), ev, false)
+		err = newTR.ForceRestart(context.Background(), ev, false)
 		return err == nil, err
 	}, func(err error) {
 		require.NoError(t, err)
@@ -426,7 +426,7 @@ func TestTaskRunner_Restore_Dead(t *testing.T) {
 	defer newTR2.Kill(context.Background(), structs.NewTaskEvent("cleanup"))
 
 	ev := &structs.TaskEvent{Type: structs.TaskRestartSignal}
-	err = newTR2.Rerun(context.Background(), ev, false)
+	err = newTR2.ForceRestart(context.Background(), ev, false)
 	require.Equal(t, err, ErrTaskNotRunning)
 }
 
@@ -1386,15 +1386,15 @@ func TestTaskRunner_CheckWatcher_Restart(t *testing.T) {
 		"Received",
 		"Task Setup",
 		"Started",
-		"Restart Running Signaled",
+		"Restart Signaled",
 		"Terminated",
 		"Restarting",
 		"Started",
-		"Restart Running Signaled",
+		"Restart Signaled",
 		"Terminated",
 		"Restarting",
 		"Started",
-		"Restart Running Signaled",
+		"Restart Signaled",
 		"Terminated",
 		"Not Restarting",
 	}

website/content/docs/commands/alloc/restart.mdx

@@ -39,7 +39,8 @@ allocation's namespace.
 ## Restart Options
 
 - `-all-tasks`: If set, all tasks in the allocation will be restarted, even the
-  ones that already ran. This option cannot be used if a task is defined.
+  ones that already ran. This option cannot be used with `-task` or the
+  `<task>` argument.
 
 - `-task`: Specify the individual task to restart. This option cannot be used
   with `-all-tasks`.