Skip to content

Commit

Permalink
Unblock nested and noaa for public serverless (#488)
Browse files Browse the repository at this point in the history
  • Loading branch information
gbanasiak authored Oct 23, 2023
1 parent dff4906 commit 2f3a006
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 0 deletions.
2 changes: 2 additions & 0 deletions nested/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ This track allows to overwrite the following parameters with Rally 0.8.0+ using
* `index_settings`: A list of index settings. Index settings defined elsewhere (e.g. `number_of_replicas`) need to be overridden explicitly.
* `cluster_health` (default: "green"): The minimum required cluster health.
* `error_level` (default: "non-fatal"): Available for bulk operations only to specify ignore-response-error-level.
* `post_ingest_sleep` (default: false): Whether to pause after ingest and prior to subsequent operations.
* `post_ingest_sleep_duration` (default: 30): Sleep duration in seconds.

### License

Expand Down
9 changes: 9 additions & 0 deletions nested/challenges/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@
"include-in-reporting": false
}
},
{# serverless-post-ingest-sleep-marker-start #}{%- if post_ingest_sleep|default(false) -%}
{
"name": "post-ingest-sleep",
"operation": {
"operation-type": "sleep",
"duration": {{ post_ingest_sleep_duration|default(30) }}
}
},
{%- endif -%}{# serverless-post-ingest-sleep-marker-end #}
{
"operation": "randomized-nested-queries",
"clients": 2,
Expand Down
2 changes: 2 additions & 0 deletions nested/index.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"settings": {
{# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
"index.number_of_shards": {{number_of_shards | default(1)}},
"index.number_of_replicas": {{number_of_replicas | default(0)}},
"index.store.type": "{{store_type | default('fs')}}",
"index.requests.cache.enable": false
{%- endif -%}{# non-serverless-index-settings-marker-end #}
},
"mappings": {
"dynamic": "strict",
Expand Down
2 changes: 2 additions & 0 deletions noaa/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ This track allows to overwrite the following parameters with Rally 0.8.0+ using
* `error_level` (default: "non-fatal"): Available for bulk operations only to specify ignore-response-error-level.
* `max_num_segments` (default: not set): An integer specifying the max amount of segments the force-merge operation should use.
* `include_aggs` (default: false): A boolean defining whether the 'aggs' specific tasks will be executed when running the `default` challenge.
* `post_ingest_sleep` (default: false): Whether to pause after ingest and prior to subsequent operations.
* `post_ingest_sleep_duration` (default: 30): Sleep duration in seconds.

### License

Expand Down
27 changes: 27 additions & 0 deletions noaa/challenges/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@
"include-in-reporting": false
}
},
{# serverless-post-ingest-sleep-marker-start #}{%- if post_ingest_sleep|default(false) -%}
{
"name": "post-ingest-sleep",
"operation": {
"operation-type": "sleep",
"duration": {{ post_ingest_sleep_duration|default(30) }}
}
},
{%- endif -%}{# serverless-post-ingest-sleep-marker-end #}
{
"operation": "range_field_big_range",
"warmup-iterations": 100,
Expand Down Expand Up @@ -237,6 +246,15 @@
"include-in-reporting": false
}
},
{# serverless-post-ingest-sleep-marker-start #}{%- if post_ingest_sleep|default(false) -%}
{
"name": "post-ingest-sleep",
"operation": {
"operation-type": "sleep",
"duration": {{ post_ingest_sleep_duration|default(30) }}
}
},
{%- endif -%}{# serverless-post-ingest-sleep-marker-end #}
{% include 'aggs-tasks.json' %}
]
},
Expand Down Expand Up @@ -289,6 +307,15 @@
"operation": "refresh",
"clients": 1
},
{# serverless-post-ingest-sleep-marker-start #}{%- if post_ingest_sleep|default(false) -%}
{
"name": "post-ingest-sleep",
"operation": {
"operation-type": "sleep",
"duration": {{ post_ingest_sleep_duration|default(30) }}
}
},
{%- endif -%}{# serverless-post-ingest-sleep-marker-end #}
{% include 'filters-aggs-tasks.json' %}
{
"operation": "filter-agg-with-high-cardinality-filter",
Expand Down
2 changes: 2 additions & 0 deletions noaa/index.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"settings": {
{# non-serverless-index-settings-marker-start #}{%- if build_flavor != "serverless" or serverless_operator == true -%}
"index.number_of_shards": {{number_of_shards | default(1)}},
"index.number_of_replicas": {{number_of_replicas | default(0)}},
"index.queries.cache.enabled": false,
"index.requests.cache.enable": false,
"index.merge.policy.max_merged_segment": "100GB"
{%- endif -%}{# non-serverless-index-settings-marker-end #}
},
"mappings": {
"dynamic": "strict",
Expand Down

0 comments on commit 2f3a006

Please sign in to comment.