From 7222011f577f9d15f7ca25a84009a89e19263e89 Mon Sep 17 00:00:00 2001 From: Kostas Botsas Date: Mon, 5 May 2025 16:27:43 +0300 Subject: [PATCH 1/2] add as_target_throughputs param to wikipedia challenge --- wikipedia/README.md | 4 +- .../common/ingest-autoscale-schedule.json | 38 +++++++++++++------ .../ingest-search-autoscale-schedule.json | 16 ++++++++ 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/wikipedia/README.md b/wikipedia/README.md index a02a65ae..8db1d800 100644 --- a/wikipedia/README.md +++ b/wikipedia/README.md @@ -81,9 +81,10 @@ 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_target_throughputs` (default: [-1,-1,-1,-1,-1]) ### Parameters for search-autoscale challenge @@ -108,6 +109,7 @@ 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_target_throughputs` (default: [-1,-1,-1,-1,-1]) - Search Operations: - `search_size` (default: 10) - `as_search_clients` (default: [1,2,4,8,16]) diff --git a/wikipedia/challenges/common/ingest-autoscale-schedule.json b/wikipedia/challenges/common/ingest-autoscale-schedule.json index 7a07f7e9..c3751fa1 100644 --- a/wikipedia/challenges/common/ingest-autoscale-schedule.json +++ b/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_target_throughputs = (as_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_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_target_throughputs[i]}} + } + {%- endif %} {%- endfor %} diff --git a/wikipedia/challenges/common/ingest-search-autoscale-schedule.json b/wikipedia/challenges/common/ingest-search-autoscale-schedule.json index a440cddc..ea6fa464 100644 --- a/wikipedia/challenges/common/ingest-search-autoscale-schedule.json +++ b/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_target_throughputs = (as_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_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_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}}", From 028dacec926e338ce1279e3180017c47448bc4da Mon Sep 17 00:00:00 2001 From: Kostas Botsas Date: Tue, 6 May 2025 12:05:47 +0300 Subject: [PATCH 2/2] rename target throughput parameter and add docs --- wikipedia/README.md | 11 +++++++++-- .../challenges/common/ingest-autoscale-schedule.json | 6 +++--- .../common/ingest-search-autoscale-schedule.json | 6 +++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/wikipedia/README.md b/wikipedia/README.md index 8db1d800..512ce398 100644 --- a/wikipedia/README.md +++ b/wikipedia/README.md @@ -84,7 +84,9 @@ This track accepts the following parameters with Rally 0.8.0+ using `--track-par - `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_target_throughputs` (default: [-1,-1,-1,-1,-1]) + - `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 @@ -98,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: @@ -109,12 +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_target_throughputs` (default: [-1,-1,-1,-1,-1]) + - `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/). diff --git a/wikipedia/challenges/common/ingest-autoscale-schedule.json b/wikipedia/challenges/common/ingest-autoscale-schedule.json index c3751fa1..a1c44bac 100644 --- a/wikipedia/challenges/common/ingest-autoscale-schedule.json +++ b/wikipedia/challenges/common/ingest-autoscale-schedule.json @@ -24,12 +24,12 @@ } } {%- set p_as_warmup_time_periods = (as_warmup_time_periods | default([600,600,600,600,600]))%} -{%- set p_as_target_throughputs = (as_target_throughputs | default([-1,-1,-1,-1,-1]))%} +{%- 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) %}, - {%- if p_as_target_throughputs[i] < 0 %} + {%- 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]}}, @@ -52,7 +52,7 @@ }, "warmup-time-period": {{p_as_warmup_time_periods[i]}}, "time-period": {{p_as_time_periods[i]}}, - "target-throughput": {{p_as_target_throughputs[i]}} + "target-throughput": {{p_as_ingest_target_throughputs[i]}} } {%- endif %} {%- endfor %} diff --git a/wikipedia/challenges/common/ingest-search-autoscale-schedule.json b/wikipedia/challenges/common/ingest-search-autoscale-schedule.json index ea6fa464..8d89964d 100644 --- a/wikipedia/challenges/common/ingest-search-autoscale-schedule.json +++ b/wikipedia/challenges/common/ingest-search-autoscale-schedule.json @@ -24,7 +24,7 @@ } } {%- set p_as_warmup_time_periods = (as_warmup_time_periods | default([600,600,600,600,600]))%} -{%- set p_as_target_throughputs = (as_target_throughputs | default([-1,-1,-1,-1,-1]))%} +{%- 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))%} @@ -37,7 +37,7 @@ "warmup-time-period": {{p_as_time_periods[i]}}, "time-period": {{p_as_warmup_time_periods[i]}}, "tasks": [ - {%- if p_as_target_throughputs[i] < 0 %} + {%- 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]}}, @@ -60,7 +60,7 @@ }, "warmup-time-period": {{p_as_warmup_time_periods[i]}}, "time-period": {{p_as_time_periods[i]}}, - "target-throughput": {{p_as_target_throughputs[i]}} + "target-throughput": {{p_as_ingest_target_throughputs[i]}} }, {%- endif %} {%- if p_as_search_target_throughputs[i] < 0 %}