add configurable warmup iterations + iterations to geoshape, geopoint…

…shape, geopoint workloads (#450) Signed-off-by: Michael Oviedo <[email protected]>
opensearch-project · Oct 17, 2024 · ca3f732 · ca3f732
1 parent df73e87
commit ca3f732
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/geopoint/test_procedures/default.json b/geopoint/test_procedures/default.json
@@ -61,29 +61,29 @@
         },
         {
           "operation": "polygon",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ polygon_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ polygon_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }},
           "clients": {{ polygon_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "bbox",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ bbox_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ bbox_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
           "clients": {{ bbox_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "distance",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ distance_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ distance_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ distance_target_throughput or target_throughput | default(5) | tojson }},
           "clients": {{ distance_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "distanceRange",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ distanceRange_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ distanceRange_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ distanceRange_target_throughput or target_throughput | default(0.5) | tojson }},
           "clients": {{ distanceRange_search_clients or search_clients | default(1) }}
         }

diff --git a/geopointshape/test_procedures/default.json b/geopointshape/test_procedures/default.json
@@ -59,15 +59,15 @@
         },
         {
           "operation": "polygon",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ polygon_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ polygon_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }},
           "clients": {{ polygon_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "bbox",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ bbox_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ bbox_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
           "clients": {{ bbox_search_clients or search_clients | default(1) }}
         }

diff --git a/geoshape/test_procedures/default.json b/geoshape/test_procedures/default.json
@@ -126,15 +126,15 @@
         },
         {
           "operation": "polygon",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ polygon_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ polygon_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ polygon_target_throughput or target_throughput | default(0.3) | tojson }},
           "clients": {{ polygon_search_clients or search_clients | default(1) }}
         },
         {
           "operation": "bbox",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": {{ bbox_warmup_iterations or warmup_iterations | default(200) | tojson }},
+          "iterations": {{ bbox_iterations or iterations | default(100) | tojson }},
           "target-throughput": {{ bbox_target_throughput or target_throughput | default(0.25) | tojson }},
           "clients": {{ bbox_search_clients or search_clients | default(1) }}
         }