fix(run): Remove stop race condition (#655)

Approved-by: Alexander Jung <[email protected]>
unikraft · Jul 24, 2023 · 20225fb · 20225fb
2 parents b14725b + 9860b19
commit 20225fb
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/cmd/kraft/run/run.go b/cmd/kraft/run/run.go
@@ -386,18 +386,6 @@ func (opts *Run) Run(cmd *cobra.Command, args []string) error {
 					break loop
 				}
 			}
-
-			// Remove the instance on Ctrl+C if the --rm flag is passed
-			if opts.Remove {
-				if _, err := opts.machineController.Stop(ctx, machine); err != nil {
-					log.G(ctx).Errorf("could not stop: %v", err)
-					return
-				}
-				if _, err := opts.machineController.Delete(ctx, machine); err != nil {
-					log.G(ctx).Errorf("could not remove: %v", err)
-					return
-				}
-			}
 		}()
 	}
 
@@ -431,6 +419,17 @@ func (opts *Run) Run(cmd *cobra.Command, args []string) error {
 				break loop
 			}
 		}
+
+		// Remove the instance on Ctrl+C if the --rm flag is passed
+		if opts.Remove {
+			if _, err := opts.machineController.Stop(ctx, machine); err != nil {
+				log.G(ctx).Errorf("could not stop: %v", err)
+			}
+
+			if _, err := opts.machineController.Delete(ctx, machine); err != nil {
+				log.G(ctx).Errorf("could not remove: %v", err)
+			}
+		}
 	} else {
 		// Output the name of the instance such that it can be piped
 		fmt.Fprintf(iostreams.G(ctx).Out, "%s\n", machine.Name)