Also clean up when cancelling experiment

timebertt · Aug 22, 2023 · 95b48ff · 95b48ff
1 parent b6ec225
commit 95b48ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/webhosting-operator/pkg/experiment/scenario/basic/basic.go b/webhosting-operator/pkg/experiment/scenario/basic/basic.go
@@ -172,13 +172,11 @@ func (s *scenario) Start(ctx context.Context) error {
 
 	select {
 	case <-ctx.Done():
-		log.Info("Scenario cancelled")
-		return ctx.Err()
+		log.Info("Scenario cancelled, cleaning up")
 	case <-time.After(15 * time.Minute):
+		log.Info("Scenario finished, cleaning up")
 	}
 
-	log.Info("Scenario finished, cleaning up")
-
 	cleanupCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 

diff --git a/webhosting-operator/pkg/experiment/scenario/reconcile/reconcile.go b/webhosting-operator/pkg/experiment/scenario/reconcile/reconcile.go
@@ -136,13 +136,11 @@ func (s *scenario) Start(ctx context.Context) error {
 
 	select {
 	case <-ctx.Done():
-		log.Info("Scenario cancelled")
-		return ctx.Err()
+		log.Info("Scenario cancelled, cleaning up")
 	case <-time.After(15 * time.Minute):
+		log.Info("Scenario finished, cleaning up")
 	}
 
-	log.Info("Scenario finished, cleaning up")
-
 	cleanupCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()