Merge branch 'master' into f-ui/alloc-fs

* master:
  make purge parameter lowercase (#5895)
  tr: Fetch Wait channel before killTask in restart

client/allocrunner/taskrunner/lifecycle.go

@@ -28,18 +28,19 @@ func (tr *TaskRunner) Restart(ctx context.Context, event *structs.TaskEvent, fai
 	// Tell the restart tracker that a restart triggered the exit
 	tr.restartTracker.SetRestartTriggered(failure)
 
+	// Grab a handle to the wait channel that will timeout with context cancelation
+	// _before_ killing the task.
+	waitCh, err := handle.WaitCh(ctx)
+	if err != nil {
+		return err
+	}
+
 	// Kill the task using an exponential backoff in-case of failures.
 	if err := tr.killTask(handle); err != nil {
 		// We couldn't successfully destroy the resource created.
 		tr.logger.Error("failed to kill task. Resources may have been leaked", "error", err)
 	}
 
-	// Drain the wait channel or wait for the request context to be canceled
-	waitCh, err := handle.WaitCh(ctx)
-	if err != nil {
-		return err
-	}
-
 	select {
 	case <-waitCh:
 	case <-ctx.Done():

website/source/api/jobs.html.md

@@ -1726,7 +1726,7 @@ The table below shows this endpoint's support for
 - `:job_id` `(string: <required>)` - Specifies the ID of the job (as specified in
   the job file during submission). This is specified as part of the path.
 
-- `Purge` `(bool: false)` - Specifies that the job should stopped and purged
+- `purge` `(bool: false)` - Specifies that the job should stopped and purged
   immediately. This means the job will not be queryable after being stopped. If
   not set, the job will be purged by the garbage collector.