Introduce track parameters

Relates elastic/rally#310
elastic · Nov 17, 2017 · 309f53e · 309f53e
1 parent 1e08612
commit 309f53e
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 12 deletions.
diff --git a/geonames/README.md b/geonames/README.md
@@ -31,6 +31,12 @@ Modifications:
 }
 ```
 
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
+
 ### License
 
 We use the same license for the data as the original data from Geonames:

diff --git a/geonames/operations/default.json b/geonames/operations/default.json
@@ -1,12 +1,12 @@
 {
       "name": "index-append",
       "operation-type": "index",
-      "bulk-size": 5000
+      "bulk-size": {{bulk_size | default(5000)}}
     },
     {
       "name": "index-update",
       "operation-type": "index",
-      "bulk-size": 5000,
+      "bulk-size": {{bulk_size | default(5000)}},
       "conflicts": "random"
     },
     {

diff --git a/geopoint/README.md b/geopoint/README.md
@@ -13,6 +13,12 @@ This track is based on [PlanetOSM](http://wiki.openstreetmap.org/wiki/Planet.osm
 }
 ```
 
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
+
 ### License
 
 Same license as the original data from PlanetOSM: [Open Database License](http://wiki.openstreetmap.org/wiki/Open_Database_License).
diff --git a/geopoint/operations/default.json b/geopoint/operations/default.json
@@ -1,12 +1,12 @@
     {
       "name": "index-append",
       "operation-type": "index",
-      "bulk-size": 5000
+      "bulk-size": {{bulk_size | default(5000)}}
     },
     {
       "name": "index-update",
       "operation-type": "index",
-      "bulk-size": 5000,
+      "bulk-size": {{bulk_size | default(5000)}},
       "conflicts": "random"
     },
     {

diff --git a/logging/README.md b/logging/README.md
@@ -22,6 +22,12 @@ Modifications:
 }
 ```
 
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
+
 ### License
 
 Original license text:

diff --git a/logging/operations/default.json b/logging/operations/default.json
@@ -1,7 +1,7 @@
     {
       "name": "index-append",
       "operation-type": "index",
-      "bulk-size": 5000
+      "bulk-size": {{bulk_size | default(5000)}}
     },
     {
       "name": "force-merge",

diff --git a/nested/README.md b/nested/README.md
@@ -46,6 +46,12 @@ These scripts are available in the raw_data_prep_scripts.zip file.
 }
 ```
 
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
+
 ### License
 
 We use the same license for the data as the original data: [CC-SA-3.0](http://creativecommons.org/licenses/by-sa/3.0/)

diff --git a/nested/operations/default.json b/nested/operations/default.json
@@ -1,7 +1,7 @@
     {
       "name": "index-append",
       "operation-type": "index",
-      "bulk-size": 5000
+      "bulk-size": {{bulk_size | default(5000)}}
     },
     {
       "name": "force-merge",

diff --git a/noaa/README.md b/noaa/README.md
@@ -39,3 +39,9 @@ To recreate the document corpus:
   "TMIN": 15.5
 }
 ```
+
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
diff --git a/noaa/operations/default.json b/noaa/operations/default.json
@@ -1,7 +1,7 @@
     {
       "name": "index",
       "operation-type": "index",
-      "bulk-size": 5000
+      "bulk-size": {{bulk_size | default(5000)}}
     },
     {
       "name": "force-merge",

diff --git a/nyc_taxis/README.md b/nyc_taxis/README.md
@@ -52,3 +52,9 @@ bzip2 -k documents.json
   "vendor_id": "2"
 }
 ```
+
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json
@@ -1,7 +1,7 @@
     {
       "name": "index",
       "operation-type": "index",
-      "bulk-size": 10000
+      "bulk-size": {{bulk_size | default(10000)}}
     },
     {
       "name": "default",

diff --git a/percolator/README.md b/percolator/README.md
@@ -16,6 +16,12 @@ The queries.json.bz2 file contains list of ES queries that has been randomly gen
 }
 ```
 
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
+
 ### License
 
 AOL's original README:

diff --git a/percolator/operations/default.json b/percolator/operations/default.json
@@ -1,7 +1,7 @@
     {
       "name": "index",
       "operation-type": "index",
-      "bulk-size": 5000
+      "bulk-size": {{bulk_size | default(5000)}}
     },
     {
       "name": "force-merge",

diff --git a/pmc/README.md b/pmc/README.md
@@ -22,6 +22,13 @@ Note that the ``body`` content is actually much longer has been shortened here t
 }
 ```
 
+### Parameters
+
+This track allows to overwrite the following parameters with Rally 0.8.0+ using `--track-params`:
+
+* `bulk_size`
+* [`default_search_timeout`](https://www.elastic.co/guide/en/elasticsearch/reference/6.0/search.html#global-search-timeout)
+
 ### License
 
 All articles that are included are licensed as CC-BY (http://creativecommons.org/licenses/by/2.0/)

diff --git a/pmc/challenges/default.json b/pmc/challenges/default.json
@@ -3,7 +3,7 @@
       "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only. After that a couple of queries are run.",
       "default": true,
       "cluster-settings": {
-        "search.default_search_timeout": "{{search_timeout | default(-1)}}"
+        "search.default_search_timeout": "{{default_search_timeout | default(-1)}}"
       },
       "index-settings": {
         "index.number_of_replicas": 0

diff --git a/pmc/operations/default.json b/pmc/operations/default.json
@@ -1,12 +1,12 @@
     {
       "name": "index-append",
       "operation-type": "index",
-      "bulk-size": 500
+      "bulk-size": {{bulk_size | default(500)}}
     },
     {
       "name": "index-update",
       "operation-type": "index",
-      "bulk-size": 500,
+      "bulk-size": {{bulk_size | default(500)}},
       "conflicts": "random"
     },
     {