Fixes kube-burner#413

afcollins · Aug 10, 2023 · 68dae0f · 68dae0f
1 parent 8d033ae
commit 68dae0f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkg/burner/job.go b/pkg/burner/job.go
@@ -113,16 +113,16 @@ func Run(configSpec config.Spec, prometheusClients []*prometheus.Prometheus, ale
 			}
 			jobList[jobPosition].Start = time.Now().UTC()
 			measurements.SetJobConfig(&job.Job)
+			if job.Cleanup {
+				ctx, cancel := context.WithTimeout(context.Background(), globalConfig.GCTimeout)
+				defer cancel()
+				CleanupNamespaces(ctx, v1.ListOptions{LabelSelector: fmt.Sprintf("kube-burner-job=%s", job.Name)}, true)
+				CleanupNonNamespacedResources(ctx, v1.ListOptions{LabelSelector: fmt.Sprintf("kube-burner-job=%s", job.Name)}, true)
+			}
 			log.Infof("Triggering job: %s", job.Name)
 			measurements.Start()
 			switch job.JobType {
 			case config.CreationJob:
-				if job.Cleanup {
-					ctx, cancel := context.WithTimeout(context.Background(), globalConfig.GCTimeout)
-					defer cancel()
-					CleanupNamespaces(ctx, v1.ListOptions{LabelSelector: fmt.Sprintf("kube-burner-job=%s", job.Name)}, true)
-					CleanupNonNamespacedResources(ctx, v1.ListOptions{LabelSelector: fmt.Sprintf("kube-burner-job=%s", job.Name)}, true)
-				}
 				if job.Churn {
 					log.Info("Churning enabled")
 					log.Infof("Churn duration: %v", job.ChurnDuration)

diff --git a/pkg/measurements/factory.go b/pkg/measurements/factory.go
@@ -92,7 +92,8 @@ func SetJobConfig(jobConfig *config.Job) {
 // Start starts registered measurements
 func Start() {
 	var wg sync.WaitGroup
-	for _, measurement := range factory.createFuncs {
+	for name, measurement := range factory.createFuncs {
+		log.Infof("Starting measurement: %s", name)
 		wg.Add(1)
 		go measurement.start(&wg)
 	}