Create-Workload Improvements: Write Test Procedures and Operations into Separate Directories and Files

.gitignore

@@ -115,3 +115,6 @@ recipes/ccr/ccr-target-hosts.json
 
 # Tracker tracks
 tracks/
+
+# Visual Studio Code for Contributors
+.vscode/

osbenchmark/resources/base-workload.json.j2

@@ -22,35 +22,10 @@
       ]
     }{% endfor %}
   ],
-  "schedule": [
-    {
-      "operation": "delete-index"
-    },{% raw %}
-    {
-      "operation": {
-        "operation-type": "create-index",
-        "settings": {{index_settings | default({}) | tojson}}
-      }
-    },{% endraw %}
-    {
-      "operation": {
-        "operation-type": "cluster-health",
-        "index": {{ indices | map(attribute='name') | list | join(',') | tojson }},{% raw %}
-        "request-params": {
-          "wait_for_status": "{{cluster_health | default('green')}}",
-          "wait_for_no_relocating_shards": "true"
-        },
-        "retry-until-success": true
-      }
-    },
-    {
-      "operation": {
-        "operation-type": "bulk",
-        "bulk-size": {{bulk_size | default(5000)}},
-        "ingest-percentage": {{ingest_percentage | default(100)}}
-      },
-      "clients": {{bulk_indexing_clients | default(8)}}
-    },{% endraw -%}
-    {% block queries %}{% endblock %}
+  "operations": [
+    {% raw %}{{ benchmark.collect(parts="operations/*.json") }}{% endraw %}
+  ],
+  "test_procedures": [
+    {% raw %}{{ benchmark.collect(parts="test_procedures/*.json") }}{% endraw %}
   ]
-}
+}

osbenchmark/resources/custom-operations.json.j2

@@ -0,0 +1,16 @@
+    {
+      "name": "index-append",
+      "operation-type": "bulk",
+      "bulk-size": {{bulk_size}},
+      "ingest-percentage": {{ingest_percentage}}
+    },
+    {
+      "name": "search",
+      "operation-type": "search",
+      "index": {{ indices | map(attribute='name') | list | join(',') | tojson }},
+      "body": {
+        "query": {
+          "match_all": {}
+        }
+      }
+    }

osbenchmark/resources/custom-test-procedures.json.j2

@@ -0,0 +1,58 @@
+{ 
+  "name": "append-no-conflicts",
+  "schedule": [
+    {
+      "operation": "delete-index"
+    },{% raw %}
+    {
+      "operation": {
+        "operation-type": "create-index",
+        "settings": {{index_settings | tojson}}
+      }
+    },{% endraw %}
+    {
+      "operation": {
+        "operation-type": "cluster-health",
+        "index": {{ indices | map(attribute='name') | list | join(',') | tojson }},{% raw %}
+        "request-params": {
+          "wait_for_status": "{{cluster_health}}",
+          "wait_for_no_relocating_shards": "true"
+        },
+        "retry-until-success": true
+      }
+    },
+    {
+      "operation": "index-append",
+      {% raw -%}"clients": {{bulk_indexing_clients}},
+      "ignore-response-error-level": "{{error_level}}"{% endraw -%}
+    },
+    {
+      "name": "refresh-after-index",
+      "operation": "refresh"
+    },
+    {
+      "name": "search-after-index",
+      "operation": "search"
+    },
+    {% endraw -%}
+      {%- block queries -%}
+        {% for query in custom_queries %}
+        {
+          "operation":"{{query.name}}", 
+          "warmup-iterations": {{query.warmup_iterations}}}},
+          "iterations": {{query.iterations}},
+          {%- if query.target_throughput %}
+          "target-throughput": {{ query.target_throughput}}
+          {%- else %}
+          "target-throughput": {{ query.target_throughput | tojson }}
+          {%- endif %}
+          {%-if search_clients is defined and search_clients %}
+          ,"clients": {{ search_clients | tojson}}
+          {%- endif %}
+        },{% if not loop.last %},{% endif -%}
+        {% endfor %}
+      {%- endblock %}
+    }
+  ]
+}
+

osbenchmark/resources/default-operations.json.j2

@@ -0,0 +1,16 @@
+    {
+      "name": "index-append",
+      "operation-type": "bulk",
+      "bulk-size": {{bulk_size | default(5000)}},
+      "ingest-percentage": {{ingest_percentage | default(100)}}
+    },
+    {
+      "name": "search",
+      "operation-type": "search",
+      "index": {{ indices | map(attribute='name') | list | join(',') | tojson }},
+      "body": {
+        "query": {
+          "match_all": {}
+        }
+      }
+    }

osbenchmark/resources/default-test-procedures.json.j2

@@ -0,0 +1,41 @@
+{ 
+  "name": "append-no-conflicts",
+  "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. Document ids are unique so all index operations are append only.",
+  "default": true,
+  "schedule": [
+    {
+      "operation": "delete-index"
+    },{% raw %}
+    {
+      "operation": {
+        "operation-type": "create-index",
+        "settings": {{index_settings | default({}) | tojson}}
+      }
+    },{% endraw %}
+    {
+      "operation": {
+        "operation-type": "cluster-health",
+        "index": {{ indices | map(attribute='name') | list | join(',') | tojson }},{% raw %}
+        "request-params": {
+          "wait_for_status": "{{cluster_health | default('green')}}",
+          "wait_for_no_relocating_shards": "true"
+        },
+        "retry-until-success": true
+      }
+    },{% endraw -%}
+    {
+      "operation": "index-append",
+      {% raw -%} "clients": {{bulk_indexing_clients | default(8)}},{% endraw -%}
+      {% raw -%}"ignore-response-error-level": "{{error_level | default('non-fatal')}}"{% endraw -%}
+    },
+    {
+      "name": "refresh-after-index",
+      "operation": "refresh"
+    }, 
+    {
+      "name": "search-after-index",
+      "operation": "search"
+    }
+  ]
+}
+