Support target ingest throughput options to wikipedia scaling challenges

wikipedia/README.md

@@ -81,9 +81,12 @@ This track accepts the following parameters with Rally 0.8.0+ using `--track-par
   - `initial_ingest_bulk_size` (default: 100)
 - Ingest Operations:
   - `ingest_bulk_size` (default: 100)
-  - `as_warmup_time_periods` (default: [600,600,600,600,600]) 
+  - `as_warmup_time_periods` (default: [600,600,600,600,600])
   - `as_time_periods` (default: [1800,1800,1800,1800,1800])
   - `as_ingest_clients` (default: [1,2,4,8,16])
+  - `as_ingest_target_throughputs` (default: [-1,-1,-1,-1,-1])
+
+When `as_ingest_target_throughputs` is a positive number, the ingest throughput formula in documents per second is `ingest_bulk_size * as_ingest_target_throughputs`.
 
 ### Parameters for search-autoscale challenge
 
@@ -97,6 +100,8 @@ This track accepts the following parameters with Rally 0.8.0+ using `--track-par
   - `as_search_clients` (default: [1,2,4,8,16])
   - `as_search_target_throughputs` (default: [-1,-1,-1,-1,-1])
 
+When `as_search_target_throughputs` is a positive number, the search throughput formula in documents per second is `search_size * as_search_target_throughputs`.
+
 ### Parameters for ingest-search-autoscale challenge
 
 - Initial indexing:
@@ -108,11 +113,15 @@ This track accepts the following parameters with Rally 0.8.0+ using `--track-par
 - Ingest Operations:
   - `ingest_bulk_size` (default: 100)
   - `as_ingest_clients` (default: [1,2,4,8,16])
+  - `as_ingest_target_throughputs` (default: [-1,-1,-1,-1,-1])
 - Search Operations:
   - `search_size` (default: 10)
   - `as_search_clients` (default: [1,2,4,8,16])
   - `as_search_target_throughputs` (default: [-1,-1,-1,-1,-1])
 
+When `as_ingest_target_throughputs` is a positive number, the ingest throughput formula in documents per second is `ingest_bulk_size * as_ingest_target_throughputs`.
+When `as_search_target_throughputs` is a positive number, the search throughput formula in documents per second is `search_size * as_search_target_throughputs`.
+
 ### 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/).

wikipedia/challenges/common/ingest-autoscale-schedule.json

@@ -24,19 +24,35 @@
   }
 }
 {%- set p_as_warmup_time_periods = (as_warmup_time_periods | default([600,600,600,600,600]))%}
+{%- set p_as_ingest_target_throughputs = (as_ingest_target_throughputs | default([-1,-1,-1,-1,-1]))%}
 {%- set p_as_time_periods = (as_time_periods | default([1800,1800,1800,1800,1800]))%}
 {%- set p_as_ingest_clients = (as_ingest_clients | default([1,2,4,8,16]))%}
 {%- set p_ingest_bulk_size = (ingest_bulk_size | default(100))%}
 {%- for i in range(p_as_ingest_clients|length) %},
-{
-  "name": "ingest-{{loop.index}}-c{{p_as_ingest_clients[i]}}-b{{p_ingest_bulk_size}}",
-  "clients": {{p_as_ingest_clients[i]}},
-  "operation": {
-    "operation-type": "bulk",
-    "bulk-size": {{p_ingest_bulk_size}},
-    "looped": true
-  },
-  "warmup-time-period": {{p_as_warmup_time_periods[i]}},
-  "time-period": {{p_as_time_periods[i]}}
-}
+  {%- if p_as_ingest_target_throughputs[i] < 0 %}
+  {
+    "name": "ingest-{{loop.index}}-c{{p_as_ingest_clients[i]}}-b{{p_ingest_bulk_size}}",
+    "clients": {{p_as_ingest_clients[i]}},
+    "operation": {
+      "operation-type": "bulk",
+      "bulk-size": {{p_ingest_bulk_size}},
+      "looped": true
+    },
+    "warmup-time-period": {{p_as_warmup_time_periods[i]}},
+    "time-period": {{p_as_time_periods[i]}}
+  }
+  {%- else %}
+  {
+    "name": "ingest-{{loop.index}}-c{{p_as_ingest_clients[i]}}-b{{p_ingest_bulk_size}}",
+    "clients": {{p_as_ingest_clients[i]}},
+    "operation": {
+      "operation-type": "bulk",
+      "bulk-size": {{p_ingest_bulk_size}},
+      "looped": true
+    },
+    "warmup-time-period": {{p_as_warmup_time_periods[i]}},
+    "time-period": {{p_as_time_periods[i]}},
+    "target-throughput": {{p_as_ingest_target_throughputs[i]}}
+  }
+  {%- endif %}
 {%- endfor %}

wikipedia/challenges/common/ingest-search-autoscale-schedule.json

@@ -24,6 +24,7 @@
   }
 }
 {%- set p_as_warmup_time_periods = (as_warmup_time_periods | default([600,600,600,600,600]))%}
+{%- set p_as_ingest_target_throughputs = (as_ingest_target_throughputs | default([-1,-1,-1,-1,-1]))%}
 {%- set p_as_time_periods = (as_time_periods | default([1800,1800,1800,1800,1800]))%}
 {%- set p_as_ingest_clients = (as_ingest_clients | default([1,1,1,1,1]))%}
 {%- set p_ingest_bulk_size = (ingest_bulk_size | default(100))%}
@@ -36,6 +37,7 @@
     "warmup-time-period": {{p_as_time_periods[i]}},
     "time-period": {{p_as_warmup_time_periods[i]}},
     "tasks": [
+  {%- if p_as_ingest_target_throughputs[i] < 0 %}
       {
         "name": "parallel-ingest-{{loop.index}}-c{{p_as_ingest_clients[i]}}-b{{p_ingest_bulk_size}}",
         "clients": {{p_as_ingest_clients[i]}},
@@ -47,6 +49,20 @@
         "warmup-time-period": {{p_as_warmup_time_periods[i]}},
         "time-period": {{p_as_time_periods[i]}}
       },
+  {%- else %}
+  {
+    "name": "parallel-ingest-{{loop.index}}-c{{p_as_ingest_clients[i]}}-b{{p_ingest_bulk_size}}",
+    "clients": {{p_as_ingest_clients[i]}},
+    "operation": {
+      "operation-type": "bulk",
+      "bulk-size": {{p_ingest_bulk_size}},
+      "looped": true
+    },
+    "warmup-time-period": {{p_as_warmup_time_periods[i]}},
+    "time-period": {{p_as_time_periods[i]}},
+    "target-throughput": {{p_as_ingest_target_throughputs[i]}}
+  },
+  {%- endif %}
   {%- if p_as_search_target_throughputs[i] < 0 %}
       {
         "name": "parallel-search-{{loop.index}}-c{{p_as_search_clients[i]}}-s{{p_search_size}}",