Guard against non positive time limit

kubernetes · Feb 5, 2021 · db6047b · db6047b
1 parent 9540f98
commit db6047b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/clusterloader2/pkg/tuningset/randomized_time_limited.go b/clusterloader2/pkg/tuningset/randomized_time_limited.go
@@ -40,7 +40,10 @@ func (r *randomizedTimeLimitedLoad) Execute(actions []func()) {
 		index := i
 		wg.Start(func() {
 			// Sleeps for random duration in [0, TimeLimit].
-			time.Sleep(time.Duration(rand.Int63n(r.params.TimeLimit.ToTimeDuration().Nanoseconds())))
+			timeLimit := r.params.TimeLimit.ToTimeDuration().Nanoseconds()
+			if timeLimit > 0 {
+				time.Sleep(time.Duration(rand.Int63n(timeLimit)))
+			}
 			actions[index]()
 		})
 	}

diff --git a/clusterloader2/testing/load/config.yaml b/clusterloader2/testing/load/config.yaml
@@ -126,7 +126,7 @@ tuningSets:
     # The expected number of created/deleted pods is totalPods/4 when scaling,
     # as each RS changes its size from X to a uniform random value in [X/2, 3X/2].
     # To match 10 [pods/s] requirement, we need to divide saturationTime by 4.
-    timeLimit: {{MaxInt 1 (DivideInt $saturationTime 4)}}s
+    timeLimit: {{DivideInt $saturationTime 4}}s
 - name: RandomizedDeletionTimeLimited
   RandomizedTimeLimitedLoad:
     timeLimit: {{$deletionTime}}s