Create multiple jobs based on number of nodes

Separate Indexed from NonIndexed to compare.
kubernetes · Mar 14, 2022 · 8c2a468 · 8c2a468
1 parent 3a1ad1c
commit 8c2a468
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 12 deletions.
diff --git a/clusterloader2/pkg/measurement/common/wait_for_jobs.go b/clusterloader2/pkg/measurement/common/wait_for_jobs.go
@@ -46,7 +46,7 @@ const (
 	defaultWaitForFinishedJobsTimeout = 10 * time.Minute
 	waitForFinishedJobsName           = "WaitForFinishedJobs"
 	waitForFinishedJobsWorkers        = 1
-	checkFinishedJobsInterval         = 5 * time.Second
+	checkFinishedJobsInterval         = time.Second
 )
 
 func init() {

diff --git a/clusterloader2/testing/batch/config.yaml b/clusterloader2/testing/batch/config.yaml
@@ -1,12 +1,22 @@
+{{$mode := (DefaultParam .MODE "Indexed")}}
+{{$pods_per_node_per_size := 20}}
+{{$total_pods_per_size := MultiplyInt .Nodes $pods_per_node_per_size}}
+{{$small_job_size := 5}}
+{{$small_jobs_count := DivideInt $total_pods_per_size $small_job_size}}
+{{$medium_job_size := 20}}
+{{$medium_jobs_count := DivideInt $total_pods_per_size $medium_job_size}}
+{{$large_job_size := 400}}
+{{$large_jobs_count := DivideInt $total_pods_per_size $large_job_size}}
+
 name: batch
 
 namespace:
   number: 1
 
 tuningSets:
-- name: Uniform1qps
+- name: Uniform5qps
   qpsLoad:
-    qps: 1
+    qps: 5
 
 steps:
 - name: Start measurements
@@ -16,22 +26,45 @@ steps:
     Params:
       action: start
       labelSelector: group = test-job
-- name: Create job
+- name: Create jobs
   phases:
   - namespaceRange:
       min: 1
       max: 1
-    replicasPerNamespace: 1
-    tuningSet: Uniform1qps
+    replicasPerNamespace: {{$small_jobs_count}}
+    tuningSet: Uniform5qps
+    objectBundle:
+    - basename: small
+      objectTemplatePath: "job.yaml"
+      templateFillMap:
+        Replicas: {{$small_job_size}}
+        Mode: {{$mode}}
+  - namespaceRange:
+      min: 1
+      max: 1
+    replicasPerNamespace: {{$medium_jobs_count}}
+    tuningSet: Uniform5qps
+    objectBundle:
+    - basename: medium
+      objectTemplatePath: "job.yaml"
+      templateFillMap:
+        Replicas: {{$medium_job_size}}
+        Mode: {{$mode}}
+  - namespaceRange:
+      min: 1
+      max: 1
+    replicasPerNamespace: {{$large_jobs_count}}
+    tuningSet: Uniform5qps
     objectBundle:
-    - basename: test-job
+    - basename: large
       objectTemplatePath: "job.yaml"
       templateFillMap:
-        Replicas: 10
+        Replicas: {{$large_job_size}}
+        Mode: {{$mode}}
 - name: Wait for jobs to finish
   measurements:
   - Identifier: WaitForFinishedJobs
     Method: WaitForFinishedJobs
     Params:
       action: gather
-      timeout: 1m
+      timeout: 10m
diff --git a/clusterloader2/testing/batch/job.yaml b/clusterloader2/testing/batch/job.yaml
@@ -7,13 +7,13 @@ metadata:
 spec:
   parallelism: {{.Replicas}}
   completions: {{.Replicas}}
+  completionMode: {{.Mode}}
   template:
     metadata:
       labels:
         group: test-pod
     spec:
       containers:
       - name: {{.Name}}
-        image: bash
-        args: ["-c", "exit"]
-      restartPolicy: Never
+        image: gcr.io/k8s-staging-perf-tests/sleep:v0.0.3
+      restartPolicy: Never
diff --git a/clusterloader2/testing/batch/overrides.yaml b/clusterloader2/testing/batch/overrides.yaml
@@ -0,0 +1 @@
+MODE: Indexed