Skip to content

Commit

Permalink
add configurable throughput + client params to geopoint, geopointshap…
Browse files Browse the repository at this point in the history 
…e, geopoint workloads (#424) (#432)

(cherry picked from commit 60b0e52)

Signed-off-by: Michael Oviedo <mikeovi@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 Oct 2, 2024
1 parent 587fe42 commit 4ad2926
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 80 deletions.
52 changes: 12 additions & 40 deletions geopoint/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,58 +62,30 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"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 %}
"iterations": 100,
"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
{%- 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 %}
"iterations": 100,
"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
{%- 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 %}
"iterations": 100,
"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
{%- 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 %}
"iterations": 100,
"target-throughput": {{ distanceRange_target_throughput or target_throughput | default(0.5) | tojson }},
"clients": {{ distanceRange_search_clients or search_clients | default(1) }}
}
]
},
Expand Down
26 changes: 6 additions & 20 deletions geopointshape/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,16 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"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 %}
"iterations": 100,
"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
{%- 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 %}
"iterations": 100,
"target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }},
"clients": {{ bbox_search_clients or search_clients | default(1) }}
}
]
},
Expand Down
26 changes: 6 additions & 20 deletions geoshape/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,30 +127,16 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"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 %}
"iterations": 100,
"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
{%- 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 %}
"iterations": 100,
"target-throughput": {{ bbox_target_throughput or target_throughput | default(0.25) | tojson }},
"clients": {{ bbox_search_clients or search_clients | default(1) }}
}
]
}

0 comments on commit 4ad2926

Please sign in to comment.