From 2f3a006a627253c889bba19d426fce841630ac35 Mon Sep 17 00:00:00 2001
From: Grzegorz Banasiak <grzegorz.banasiak@elastic.co>
Date: Mon, 23 Oct 2023 13:05:24 +0200
Subject: [PATCH] Unblock nested and noaa for public serverless (#488)

---
 nested/README.md               |  2 ++
 nested/challenges/default.json |  9 +++++++++
 nested/index.json              |  2 ++
 noaa/README.md                 |  2 ++
 noaa/challenges/default.json   | 27 +++++++++++++++++++++++++++
 noaa/index.json                |  2 ++
 6 files changed, 44 insertions(+)

diff --git a/nested/README.md b/nested/README.md
index 277a8930..c0006d07 100644
--- a/nested/README.md
+++ b/nested/README.md
@@ -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
 
diff --git a/nested/challenges/default.json b/nested/challenges/default.json
index 56389563..e5b8103d 100644
--- a/nested/challenges/default.json
+++ b/nested/challenges/default.json
@@ -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,
diff --git a/nested/index.json b/nested/index.json
index 80ce0271..29e59c43 100644
--- a/nested/index.json
+++ b/nested/index.json
@@ -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",
diff --git a/noaa/README.md b/noaa/README.md
index 8147fe23..2be7c328 100644
--- a/noaa/README.md
+++ b/noaa/README.md
@@ -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
 
diff --git a/noaa/challenges/default.json b/noaa/challenges/default.json
index b05c860e..d93d8d9a 100644
--- a/noaa/challenges/default.json
+++ b/noaa/challenges/default.json
@@ -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,
@@ -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' %}
       ]
     },
@@ -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",
diff --git a/noaa/index.json b/noaa/index.json
index 0291e9e2..30929d40 100644
--- a/noaa/index.json
+++ b/noaa/index.json
@@ -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",