Skip to content

Commit

Permalink
Revert "Add configurable throughput and client parameters" (#412) (#414)
Browse files Browse the repository at this point in the history 
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.



* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.



---------


(cherry picked from commit 39de781)

Signed-off-by: Andre Kurait <akurait@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@opensearch-trigger-bot @github-actions
opensearch-trigger-bot[bot] and github-actions[bot] authored Sep 20, 2024
1 parent 17951ec commit 06236cc
Show file tree
Hide file tree
Showing 8 changed files with 1,184 additions and 352 deletions.
325 changes: 250 additions & 75 deletions geonames/test_procedures/default.json
View file

Large diffs are not rendered by default.

52 changes: 40 additions & 12 deletions geopoint/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,58 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ polygon_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 2
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
},
{
"operation": "bbox",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ bbox_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 2
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
},
{
"operation": "distance",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ distance_target_throughput or target_throughput | default(5) | tojson }},
"clients": {{ distance_search_clients or search_clients | default(1) }}
"iterations": 100
{%- 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 search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
},
{
"operation": "distanceRange",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ distanceRange_target_throughput or target_throughput | default(0.5) | tojson }},
"clients": {{ distanceRange_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 0.5
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
}
]
},
Expand Down
26 changes: 20 additions & 6 deletions geopointshape/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,30 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ polygon_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 2
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
},
{
"operation": "bbox",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ bbox_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 2
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
}
]
},
Expand Down
26 changes: 20 additions & 6 deletions geoshape/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,30 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ polygon_target_throughput or target_throughput | default(0.3) | tojson }},
"clients": {{ polygon_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 0.3
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
},
{
"operation": "bbox",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": {{ bbox_target_throughput or target_throughput | default(0.25) | tojson }},
"clients": {{ bbox_search_clients or search_clients | default(1) }}
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 0.25
{%- elif target_throughput is string and target_throughput.lower() == 'none' %}
{%- else %}
,"target-throughput": {{ target_throughput | tojson }}
{%- endif %}
{%- if search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
}
]
}
Loading

0 comments on commit 06236cc

Please sign in to comment.