add configurable throughput and client params to nested, noaa, pmc wo…

…rkloads (#406) * add configurable throughput and client params to nested, noaa, pmc workloads Signed-off-by: Michael Oviedo <mikeovi@amazon.com> * fix http_logs operation value + add name field Signed-off-by: Michael Oviedo <mikeovi@amazon.com> --------- Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
opensearch-project · Sep 20, 2024 · e7d14b6 · e7d14b6
1 parent 4d5ae33
commit e7d14b6
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 408 deletions.
diff --git a/http_logs/test_procedures/default.json b/http_logs/test_procedures/default.json
@@ -79,14 +79,16 @@
           "clients": {{ range_search_clients or search_clients | default(1) }}
         },
         {
-          "operation": "status-200s-in-range",
+          "operation": "200s-in-range",
+          "name": "status-200s-in-range",
           "warmup-iterations": 500,
           "iterations": 100,
           "target-throughput": {{ status_200s_in_range_target_throughput or target_throughput | default(33) | tojson }},
           "clients": {{ status_200s_in_range_search_clients or search_clients | default(1) }}
         },
         {
-          "operation": "status-400s-in-range",
+          "operation": "400s-in-range",
+          "name": "status-400s-in-range",
           "warmup-iterations": 500,
           "iterations": 100,
           "target-throughput": {{ status_400s_in_range_target_throughput or target_throughput | default(50) | tojson }},
@@ -294,14 +296,16 @@
           "clients": {{ range_search_clients or search_clients | default(1) }}
         },
         {
-          "operation": "status-200s-in-range",
+          "operation": "200s-in-range",
+          "name": "status-200s-in-range",
           "warmup-iterations": 500,
           "iterations": 100,
           "target-throughput": {{ status_200s_in_range_target_throughput or target_throughput | default(33) | tojson }},
           "clients": {{ status_200s_in_range_search_clients or search_clients | default(1) }}
         },
         {
-          "operation": "status-400s-in-range",
+          "operation": "400s-in-range",
+          "name": "status-400s-in-range",
           "warmup-iterations": 500,
           "iterations": 100,
           "target-throughput": {{ status_400s_in_range_target_throughput or target_throughput | default(50) | tojson }},

diff --git a/nested/test_procedures/default.json b/nested/test_procedures/default.json
@@ -61,114 +61,51 @@
         {
           "operation": "randomized-nested-queries",
           "warmup-iterations": 500,
-          "iterations": 1000
-          {%- if not target_throughput %}
-          ,"target-throughput": 20
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 1000,
+          "target-throughput": {{ randomized_nested_queries_target_throughput or target_throughput | default(20) | tojson }},
+          "clients": {{ randomized_nested_queries_search_clients or search_clients | default(2) }}
         },
         {
           "operation": "randomized-term-queries",
           "warmup-iterations": 500,
-          "iterations": 200
-          {%- if not target_throughput %}
-          ,"target-throughput": 25
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 200,
+          "target-throughput": {{ randomized_term_queries_target_throughput or target_throughput | default(25) | tojson }},
+          "clients": {{ randomized_term_queries_search_clients or search_clients | default(2) }}
         },
         {
           "operation": "randomized-sorted-term-queries",
           "warmup-iterations": 500,
-          "iterations": 200
-          {%- if not target_throughput %}
-          ,"target-throughput": 16
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 200,
+          "target-throughput": {{ randomized_sorted_term_queries_target_throughput or target_throughput | default(16) | tojson }},
+          "clients": {{ randomized_sorted_term_queries_search_clients or search_clients | default(2) }}
         },
         {
           "operation": "match-all",
           "warmup-iterations": 500,
-          "iterations": 200
-          {%- if not target_throughput %}
-          ,"target-throughput": 5
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 200,
+          "target-throughput": {{ match_all_target_throughput or target_throughput | default(5) | tojson }},
+          "clients": {{ match_all_search_clients or search_clients | default(2) }}
         },
         {
           "operation": "nested-date-histo",
           "warmup-iterations": 100,
-          "iterations": 200
-          {%- if not target_throughput %}
-          ,"target-throughput": 1
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 200,
+          "target-throughput": {{ nested_date_histo_target_throughput or target_throughput | default(1) | tojson }},
+          "clients": {{ nested_date_histo_search_clients or search_clients | default(2) }}
         },
         {
           "operation": "randomized-nested-queries-with-inner-hits_default",
           "warmup-iterations": 500,
-          "iterations": 1000
-          {%- if not target_throughput %}
-          ,"target-throughput": 18
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 1000,
+          "target-throughput": {{ randomized_nested_queries_with_inner_hits_default_target_throughput or target_throughput | default(18) | tojson }},
+          "clients": {{ randomized_nested_queries_with_inner_hits_default_search_clients or search_clients | default(2) }}
         },
         {
           "operation": "randomized-nested-queries-with-inner-hits_default_big_size",
           "warmup-iterations": 500,
-          "iterations": 1000
-          {%- if not target_throughput %}
-          ,"target-throughput": 16
-          {%- elif target_throughput is string and target_throughput.lower() == 'none' %}
-          {%- else %}
-          ,"target-throughput": {{ target_throughput | tojson }}
-          {%- endif %}
-          {%- if not search_clients %}
-          ,"clients": 2
-          {%- elif search_clients is defined and search_clients %}
-          ,"clients": {{ search_clients | tojson}}
-          {%- endif %}
+          "iterations": 1000,
+          "target-throughput": {{ randomized_nested_queries_with_inner_hits_default_big_size_target_throughput or target_throughput | default(16) | tojson }},
+          "clients": {{ randomized_nested_queries_with_inner_hits_default_big_size_search_clients or search_clients | default(2) }}
         }
       ]
     },