Merge pull request #2678 from superfly/bugfix/dont-wait-for-standby-m…

…achines `fly deploy`: don't wait for standby machines
superfly · Aug 9, 2023 · 8946b50 · 8946b50
2 parents 225138c + 6b2cbde
commit 8946b50
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/internal/command/deploy/machines_deploymachinesapp.go b/internal/command/deploy/machines_deploymachinesapp.go
@@ -275,13 +275,6 @@ func (md *machineDeployment) waitForMachine(ctx context.Context, lm machine.Leas
 		return nil
 	}
 
-	if !md.skipHealthChecks {
-		if err := lm.WaitForState(ctx, api.MachineStateStarted, md.waitTimeout, indexStr, false); err != nil {
-			err = suggestChangeWaitTimeout(err, "wait-timeout")
-			return err
-		}
-	}
-
 	// Don't wait for Standby machines, they are updated but not started
 	if len(lm.Machine().Config.Standbys) > 0 {
 		md.logClearLinesAbove(1)
@@ -293,6 +286,13 @@ func (md *machineDeployment) waitForMachine(ctx context.Context, lm machine.Leas
 		return nil
 	}
 
+	if !md.skipHealthChecks {
+		if err := lm.WaitForState(ctx, api.MachineStateStarted, md.waitTimeout, indexStr, false); err != nil {
+			err = suggestChangeWaitTimeout(err, "wait-timeout")
+			return err
+		}
+	}
+
 	if err := md.doSmokeChecks(ctx, lm, indexStr); err != nil {
 		return err
 	}