From 3a28b85b8a9c283bcb1180a95eb677cda07f7712 Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Tue, 25 Aug 2020 17:30:43 -0400
Subject: [PATCH] simplify canary check

`(alloc.DeploymentStatus == nil || !alloc.DeploymentStatus.IsCanary())`
and `!alloc.DeploymentStatus.IsCanary()` are equivalent.
---
 scheduler/reconcile.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/reconcile.go b/scheduler/reconcile.go
index e46f7cb3d..b906c6c9b 100644
--- a/scheduler/reconcile.go
+++ b/scheduler/reconcile.go
@@ -723,7 +723,7 @@ func (a *allocReconciler) computePlacements(group *structs.TaskGroup,
 			reschedule:    true,
 			canary:        alloc.DeploymentStatus.IsCanary(),
 
-			downgradeNonCanary: canaryState && (alloc.DeploymentStatus == nil || !alloc.DeploymentStatus.IsCanary()),
+			downgradeNonCanary: canaryState && !alloc.DeploymentStatus.IsCanary(),
 			minJobVersion:      alloc.Job.Version,
 		})
 	}