Status description shows requiring promotion

nomad/state/state_store.go

@@ -2015,6 +2015,11 @@ func (s *StateStore) UpdateDeploymentPromotion(index uint64, req *structs.ApplyD
 		status.Promoted = true
 	}
 
+	// If the deployment no longer needs promotion, update its status
+	if !copy.RequiresPromotion() && copy.Status == structs.DeploymentStatusRunning {
+		copy.StatusDescription = structs.DeploymentStatusDescriptionRunning
+	}
+
 	// Insert the deployment
 	if err := s.upsertDeploymentImpl(index, copy, txn); err != nil {
 		return err

nomad/state/state_store_test.go

@@ -5008,6 +5008,7 @@ func TestStateStore_UpsertDeploymentPromotion_All(t *testing.T) {
 
 	// Create a deployment
 	d := mock.Deployment()
+	d.StatusDescription = structs.DeploymentStatusDescriptionRunningNeedsPromotion
 	d.JobID = j.ID
 	d.TaskGroups = map[string]*structs.DeploymentState{
 		"web": &structs.DeploymentState{
@@ -5066,6 +5067,9 @@ func TestStateStore_UpsertDeploymentPromotion_All(t *testing.T) {
 	if err != nil {
 		t.Fatalf("bad: %v", err)
 	}
+	if dout.StatusDescription != structs.DeploymentStatusDescriptionRunning {
+		t.Fatalf("status description not updated: got %v; want %v", dout.StatusDescription, structs.DeploymentStatusDescriptionRunning)
+	}
 	if len(dout.TaskGroups) != 2 {
 		t.Fatalf("bad: %#v", dout.TaskGroups)
 	}

nomad/structs/structs.go

@@ -3920,13 +3920,14 @@ const (
 
 	// DeploymentStatusDescriptions are the various descriptions of the states a
 	// deployment can be in.
-	DeploymentStatusDescriptionRunning           = "Deployment is running"
-	DeploymentStatusDescriptionPaused            = "Deployment is paused"
-	DeploymentStatusDescriptionSuccessful        = "Deployment completed successfully"
-	DeploymentStatusDescriptionStoppedJob        = "Cancelled because job is stopped"
-	DeploymentStatusDescriptionNewerJob          = "Cancelled due to newer version of job"
-	DeploymentStatusDescriptionFailedAllocations = "Failed due to unhealthy allocations"
-	DeploymentStatusDescriptionFailedByUser      = "Deployment marked as failed"
+	DeploymentStatusDescriptionRunning               = "Deployment is running"
+	DeploymentStatusDescriptionRunningNeedsPromotion = "Deployment is running but requires promotion"
+	DeploymentStatusDescriptionPaused                = "Deployment is paused"
+	DeploymentStatusDescriptionSuccessful            = "Deployment completed successfully"
+	DeploymentStatusDescriptionStoppedJob            = "Cancelled because job is stopped"
+	DeploymentStatusDescriptionNewerJob              = "Cancelled due to newer version of job"
+	DeploymentStatusDescriptionFailedAllocations     = "Failed due to unhealthy allocations"
+	DeploymentStatusDescriptionFailedByUser          = "Deployment marked as failed"
 )
 
 // DeploymentStatusDescriptionRollback is used to get the status description of
@@ -4034,6 +4035,20 @@ func (d *Deployment) HasPlacedCanaries() bool {
 	return false
 }
 
+// RequiresPromotion returns whether the deployment requires promotion to
+// continue
+func (d *Deployment) RequiresPromotion() bool {
+	if d == nil || len(d.TaskGroups) == 0 || d.Status != DeploymentStatusRunning {
+		return false
+	}
+	for _, group := range d.TaskGroups {
+		if group.DesiredCanaries > 0 && !group.Promoted {
+			return true
+		}
+	}
+	return false
+}
+
 func (d *Deployment) GoString() string {
 	base := fmt.Sprintf("Deployment ID %q for job %q has status %q (%v):", d.ID, d.JobID, d.Status, d.StatusDescription)
 	for group, state := range d.TaskGroups {

scheduler/reconcile.go

@@ -166,6 +166,13 @@ func (a *allocReconciler) Compute() *reconcileResults {
 		})
 	}
 
+	// Set the description of a created deployment
+	if d := a.result.deployment; d != nil {
+		if d.RequiresPromotion() {
+			d.StatusDescription = structs.DeploymentStatusDescriptionRunningNeedsPromotion
+		}
+	}
+
 	return a.result
 }
 
@@ -182,6 +189,8 @@ func (a *allocReconciler) cancelDeployments() {
 		}
 
 		// Nothing else to do
+		a.oldDeployment = a.deployment
+		a.deployment = nil
 		return
 	}
 

scheduler/reconcile_test.go

@@ -1904,6 +1904,7 @@ func TestReconciler_StopOldCanaries(t *testing.T) {
 	r := reconciler.Compute()
 
 	newD := structs.NewDeployment(job)
+	newD.StatusDescription = structs.DeploymentStatusDescriptionRunningNeedsPromotion
 	newD.TaskGroups[job.TaskGroups[0].Name] = &structs.DeploymentState{
 		DesiredCanaries: 2,
 		DesiredTotal:    10,
@@ -1956,6 +1957,7 @@ func TestReconciler_NewCanaries(t *testing.T) {
 	r := reconciler.Compute()
 
 	newD := structs.NewDeployment(job)
+	newD.StatusDescription = structs.DeploymentStatusDescriptionRunningNeedsPromotion
 	newD.TaskGroups[job.TaskGroups[0].Name] = &structs.DeploymentState{
 		DesiredCanaries: 2,
 		DesiredTotal:    10,
@@ -2002,6 +2004,7 @@ func TestReconciler_NewCanaries_ScaleUp(t *testing.T) {
 	r := reconciler.Compute()
 
 	newD := structs.NewDeployment(job)
+	newD.StatusDescription = structs.DeploymentStatusDescriptionRunningNeedsPromotion
 	newD.TaskGroups[job.TaskGroups[0].Name] = &structs.DeploymentState{
 		DesiredCanaries: 2,
 		DesiredTotal:    15,
@@ -2049,6 +2052,7 @@ func TestReconciler_NewCanaries_ScaleDown(t *testing.T) {
 	r := reconciler.Compute()
 
 	newD := structs.NewDeployment(job)
+	newD.StatusDescription = structs.DeploymentStatusDescriptionRunningNeedsPromotion
 	newD.TaskGroups[job.TaskGroups[0].Name] = &structs.DeploymentState{
 		DesiredCanaries: 2,
 		DesiredTotal:    5,