consider machines that are in "destroying" state inactive, and keep r…

…elease_command machine after exit
superfly · Jan 25, 2023 · 1dcbf77 · 1dcbf77
1 parent 9bd4fa7
commit 1dcbf77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/api/machine_types.go b/api/machine_types.go
@@ -14,6 +14,7 @@ const MachineFlyPlatformVersion2 = "v2"
 const MachineProcessGroupApp = "app"
 const MachineProcessGroupFlyAppReleaseCommand = "fly_app_release_command"
 const MachineStateDestroyed = "destroyed"
+const MachineStateDestroying = "destroying"
 const MachineStateStarted = "started"
 const MachineStateStopped = "stopped"
 
@@ -51,15 +52,15 @@ func (m Machine) ImageRefWithVersion() string {
 }
 
 func (m *Machine) IsFlyAppsPlatform() bool {
-	return m.Config != nil && m.Config.Metadata[MachineConfigMetadataKeyFlyPlatformVersion] == MachineFlyPlatformVersion2 && m.State != MachineStateDestroyed
+	return m.Config != nil && m.Config.Metadata[MachineConfigMetadataKeyFlyPlatformVersion] == MachineFlyPlatformVersion2 && m.IsActive()
 }
 
 func (m *Machine) IsFlyAppsReleaseCommand() bool {
 	return m.IsFlyAppsPlatform() && m.HasProcessGroup(MachineProcessGroupFlyAppReleaseCommand)
 }
 
 func (m *Machine) IsActive() bool {
-	return m.State != MachineStateDestroyed
+	return m.State != MachineStateDestroyed && m.State != MachineStateDestroying
 }
 
 func (m *Machine) HasProcessGroup(desired string) bool {

diff --git a/internal/command/deploy/machines.go b/internal/command/deploy/machines.go
@@ -564,12 +564,6 @@ func (md *machineDeployment) runReleaseCommand(ctx context.Context) error {
 		return fmt.Errorf("error running release_command machine: %w", err)
 	}
 	releaseCmdMachine := md.releaseCommandMachine.GetMachines()[0]
-	defer func() {
-		err := releaseCmdMachine.Destroy(ctx, true)
-		if err != nil {
-			terminal.Warnf("Error destroying release_command machine %s: %v\n", md.colorize.Bold(releaseCmdMachine.Machine().ID), err)
-		}
-	}()
 	// FIXME: consolidate this wait stuff with deploy waits? Especially once we improve the outpu
 	err = releaseCmdMachine.WaitForState(ctx, api.MachineStateStarted, md.waitTimeout)
 	if err != nil {