Fix zero downtime when app fails to run

- don't need to restart again as we use --strategy=rolling which handles recovery for us Co-authored-by: David Alvarado <[email protected]> Co-authored-by: Michael Oleske <[email protected]>
cloudfoundry · Feb 1, 2023 · acf2fac · acf2fac
1 parent c96b4fc
commit acf2fac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changer/changer.go b/changer/changer.go
@@ -255,7 +255,7 @@ func (c *Changer) recoverRestart(appName, appGUID, oldStack, packageGUID, oldDro
 
 	fmt.Printf(RestagingMsg, oldStack)
 
-	return c.restartNonZDT(appName, appGUID)
+	return nil
 }
 
 func parsePackageFromDroplet(curDropletResp []string) (string, error) {

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -144,7 +144,7 @@ func testIntegration(t *testing.T, when spec.G, it spec.S) {
 				//TODO: understand why we can't confirm zero down
 				breaker := make(chan bool)
 				go confirmZeroDowntime(app, breaker, "when the cannot run on the target stack it restarts itself on the old stack")
-				defer cleanUpRoutines(breaker)
+				// defer cleanUpRoutines(breaker)
 
 				cmd := exec.Command("cf", "change-stack", app.Name, newStack)
 				out, err := cmd.CombinedOutput()
@@ -156,6 +156,7 @@ func testIntegration(t *testing.T, when spec.G, it spec.S) {
 					fmt.Println("eventually")
 					return app.GetBody("/")
 				}, 3*time.Minute).Should(ContainSubstring(appBody))
+				close(breaker)
 			})
 		})
 	})