parameterize request-timeout and warmup-time-period

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
opensearch-project · Dec 11, 2024 · aefcaab · aefcaab
1 parent 81b43e1
commit aefcaab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/common_operations/force_merge.json b/common_operations/force_merge.json
@@ -1,7 +1,7 @@
 {
     "operation": {
         "operation-type": "force-merge",
-        "request-timeout": 7200{%- if max_num_segments is defined %},
+        "request-timeout": {{ request_timeout | default(60) | tojson }}{%- if max_num_segments is defined %},
         "max-num-segments": {{ max_num_segments | tojson }}
         {%- endif %}
     }

diff --git a/common_operations/index_append.json b/common_operations/index_append.json
@@ -1,6 +1,6 @@
 {
     "operation": "index-append",
-    "warmup-time-period": 120,
+    "warmup-time-period": {{ warmup_time_period | default(120) | tojson }},
     "clients": {{bulk_indexing_clients | default(8)}},
     "ignore-response-error-level": "{{error_level | default('non-fatal')}}"
 },

diff --git a/common_operations/common_workload_setup.json → common_operations/workload_setup.json b/common_operations/common_workload_setup.json → common_operations/workload_setup.json
diff --git a/geonames/test_procedures/default.json b/geonames/test_procedures/default.json
@@ -4,7 +4,7 @@
       "default": true,
       "schedule": [
         {% with default_index_settings={} %}
-        {{ benchmark.collect(parts="../../common_operations/common_workload_setup.json") }},
+        {{ benchmark.collect(parts="../../common_operations/workload_setup.json") }},
         {% endwith %}
         {
           "operation": "index-stats",
@@ -189,7 +189,7 @@
       "description": "Indexes the whole document corpus using OpenSearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Benchmark will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only.",
       "schedule": [
         {% with default_index_settings={} %}
-        {{ benchmark.collect(parts="../../common_operations/common_workload_setup.json") }}
+        {{ benchmark.collect(parts="../../common_operations/workload_setup.json") }}
         {% endwith %}
       ]
     },
@@ -201,7 +201,7 @@
           "index.sort.field": ["country_code.raw", "admin1_code.raw"],
           "index.sort.order": ["asc", "asc"]
         } %}
-        {{ benchmark.collect(parts="../../common_operations/common_workload_setup.json") }}
+        {{ benchmark.collect(parts="../../common_operations/workload_setup.json") }}
         {% endwith %}
       ]
     },
@@ -214,7 +214,7 @@
           "index.number_of_shards": number_of_shards | default(6),
           "index.translog.flush_threshold_size": "4g"
         } %}
-        {{ benchmark.collect(parts="../../common_operations/common_workload_setup.json") }}
+        {{ benchmark.collect(parts="../../common_operations/workload_setup.json") }}
         {% endwith %}
       ]
     },
@@ -223,7 +223,7 @@
       "description": "Indexes the whole document corpus using OpenSearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Benchmark will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only.",
       "schedule": [
         {% with default_index_settings={} %}
-        {{ benchmark.collect(parts="../../common_operations/common_workload_setup.json") }},
+        {{ benchmark.collect(parts="../../common_operations/workload_setup.json") }},
         {% endwith %}
         {
           "operation": "significant_text_selective",