Skip to content

Commit

Permalink
Fix revert "Add configurable throughput and client parameters" (#418)
Browse files Browse the repository at this point in the history 
Signed-off-by: Andre Kurait <akurait@amazon.com>
  • Loading branch information
@AndreKurait
AndreKurait authored Sep 20, 2024
1 parent 06236cc commit 39cacf1
Showing 1 changed file with 2 additions and 331 deletions.
333 changes: 2 additions & 331 deletions http_logs/test_procedures/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,7 @@
},
{
"operation": "hourly_agg",
"warmup-iterations": 50,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 0.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": "multi_term_agg",
"warmup-iterations": 50,
"warmup-iterations": 100,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 0.2
Expand Down Expand Up @@ -463,7 +449,7 @@
},
{
"operation": "hourly_agg",
"warmup-iterations": 50,
"warmup-iterations": 100,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 0.2
Expand All @@ -482,34 +468,6 @@
"#COMMENT": "Throughput is considered per request. So we issue one scroll request per second which will retrieve 25 pages",
"target-throughput": 1
},
{
"operation": "desc_sort_size",
"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 %}
},
{
"operation": "asc_sort_size",
"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 %}
},
{
"operation": "desc_sort_timestamp",
"warmup-iterations": 200,
Expand Down Expand Up @@ -976,291 +934,4 @@
}
}
]
},
{
"name": "search-pipeline",
"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. Runs the search request through an search pipeline with predefined search processors.",
"schedule": [
{
"operation": "delete-index"
},
{
"operation": {
"operation-type": "create-index",
"settings": {{index_settings | default({}) | tojson}}
}
},
{
"name": "check-cluster-health",
"operation": {
"operation-type": "cluster-health",
"index": "logs-*",
"request-params": {
"wait_for_status": "{{cluster_health | default('green')}}",
"wait_for_no_relocating_shards": "true"
},
"retry-until-success": true
}
},
{
"operation": "create-http-log-baseline-search-pipeline"
},
{
"operation": "create-http-log-status-filter-search-pipeline"
},
{
"operation": "create-http-log-rename-field-search-pipeline"
},
{
"operation": "create-http-log-rename-100-field-search-pipeline"
},
{
"operation": "create-http-log-dummy-scripting-search-pipeline"
},
{
"operation": "create-http-log-100-dummy-scripting-search-pipeline"
},
{
"operation": "create-http-log-all-processors-search-pipeline"
},
{
"operation": "index-append",
"warmup-time-period": 240,
"clients": {{bulk_indexing_clients | default(8)}}
},
{
"name": "refresh-after-index",
"operation": "refresh"
},
{
"operation": {
"operation-type": "force-merge",
"request-timeout": 7200
}
},
{
"name": "refresh-after-force-merge",
"operation": "refresh"
},
{
"name": "wait-until-merges-finish",
"operation": {
"operation-type": "index-stats",
"index": "_all",
"condition": {
"path": "_all.total.merges.current",
"expected-value": 0
},
"retry-until-success": true,
"include-in-reporting": false
}
},
{
"name": "match-all",
"operation": "default",
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-baseline-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-baseline-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-status-filter-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-status-filter-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-rename-field-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-rename-field-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-rename-100-field-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-rename-100-field-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-dummy-scripting-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-dummy-scripting-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-100-dummy-scripting-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-100-dummy-scripting-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "match-all-all-processors-search-pipeline",
"operation": "default",
"request-params": {
"search-pipeline": "http-log-all-processors-search-pipeline"
},
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 8
{%- 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 %}
},
{
"name": "multi-term-filter",
"operation": "multi-term-filter",
"warmup-iterations": 500,
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 50
{%- 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 %}
},
{
"name": "term-status-filter-search-pipeline",
"operation": "term",
"warmup-iterations": 500,
"request-params": {
"search-pipeline": "http-log-status-filter-search-pipeline"
},
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 50
{%- 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 %}
},
{
"name": "range",
"operation": "range",
"warmup-iterations": 100,
"iterations": 100
{%- 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 search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
},
{
"name": "range-all-processors-search-pipeline",
"operation": "range",
"request-params": {
"search-pipeline": "http-log-all-processors-search-pipeline"
},
"warmup-iterations": 100,
"iterations": 100
{%- 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 search_clients is defined and search_clients %}
,"clients": {{ search_clients | tojson}}
{%- endif %}
}
]
}

0 comments on commit 39cacf1

Please sign in to comment.