From 55ae308e88f4ed6a9ca9f0709bdf5b28b50fc882 Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Wed, 1 Feb 2023 13:53:12 -0700 Subject: [PATCH 1/2] fixed the load-stream bechmarks such that the memory footprint does not keep growing. --- ...keys-load-stream-1-fields-with-100B-values-pipeline-10.yml | 4 ++-- ...benchmark-1Mkeys-load-stream-1-fields-with-100B-values.yml | 4 ++-- ...keys-load-stream-5-fields-with-100B-values-pipeline-10.yml | 4 ++-- ...benchmark-1Mkeys-load-stream-5-fields-with-100B-values.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values-pipeline-10.yml b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values-pipeline-10.yml index eda18272..5a86400d 100644 --- a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values-pipeline-10.yml +++ b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values-pipeline-10.yml @@ -8,7 +8,7 @@ dbconfig: keyspacelen: 0 resources: requests: - memory: 12g + memory: 5g tested-commands: - xadd redis-topologies: @@ -18,7 +18,7 @@ build-variants: clientconfig: run_image: redislabs/memtier_benchmark:edge tool: memtier_benchmark - arguments: '"--pipeline" "10" "--data-size" "100" --command "XADD __key__ * field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' + arguments: '"--pipeline" "10" "--data-size" "100" --command "XADD __key__ MAXLEN ~ 1 * field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' resources: requests: cpus: '4' diff --git a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values.yml b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values.yml index e4a13e91..4a288bc6 100644 --- a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values.yml +++ b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-1-fields-with-100B-values.yml @@ -8,7 +8,7 @@ dbconfig: keyspacelen: 0 resources: requests: - memory: 1g + memory: 5g tested-commands: - xadd redis-topologies: @@ -18,7 +18,7 @@ build-variants: clientconfig: run_image: redislabs/memtier_benchmark:edge tool: memtier_benchmark - arguments: '"--data-size" "100" --command "XADD __key__ * field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' + arguments: '"--data-size" "100" --command "XADD __key__ MAXLEN ~ 1 * field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' resources: requests: cpus: '4' diff --git a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values-pipeline-10.yml b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values-pipeline-10.yml index 03364639..6230003f 100644 --- a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values-pipeline-10.yml +++ b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values-pipeline-10.yml @@ -8,7 +8,7 @@ dbconfig: keyspacelen: 0 resources: requests: - memory: 35g + memory: 8g tested-commands: - xadd redis-topologies: @@ -18,7 +18,7 @@ build-variants: clientconfig: run_image: redislabs/memtier_benchmark:edge tool: memtier_benchmark - arguments: '"--pipeline" "10" "--data-size" "100" --command "XADD __key__ * field __data__ field __data__ field __data__ field __data__ field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' + arguments: '"--pipeline" "10" "--data-size" "100" --command "XADD __key__ MAXLEN ~ 5 * field __data__ field __data__ field __data__ field __data__ field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' resources: requests: cpus: '4' diff --git a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values.yml b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values.yml index 068b4f58..0279b4ea 100644 --- a/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values.yml +++ b/redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-stream-5-fields-with-100B-values.yml @@ -8,7 +8,7 @@ dbconfig: keyspacelen: 0 resources: requests: - memory: 35g + memory: 8g tested-commands: - xadd redis-topologies: @@ -18,7 +18,7 @@ build-variants: clientconfig: run_image: redislabs/memtier_benchmark:edge tool: memtier_benchmark - arguments: '"--data-size" "100" --command "XADD __key__ * field __data__ field __data__ field __data__ field __data__ field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' + arguments: '"--data-size" "100" --command "XADD __key__ MAXLEN ~ 5 * field __data__ field __data__ field __data__ field __data__ field __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 --test-time 180 -c 50 -t 4 --hide-histogram' resources: requests: cpus: '4' From cd74aed7dc01431a4339645c02ee4592d838269c Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Wed, 1 Feb 2023 14:06:09 -0700 Subject: [PATCH 2/2] formatting using poetry run black --- redis_benchmarks_specification/__runner__/runner.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/redis_benchmarks_specification/__runner__/runner.py b/redis_benchmarks_specification/__runner__/runner.py index 842142a4..908fa974 100644 --- a/redis_benchmarks_specification/__runner__/runner.py +++ b/redis_benchmarks_specification/__runner__/runner.py @@ -659,7 +659,12 @@ def process_self_contained_coordinator_stream( if args.benchmark_local_install: logging.info("Running memtier benchmark outside of docker") - benchmark_command_str = "taskset -c " + client_cpuset_cpus + " " + benchmark_command_str + benchmark_command_str = ( + "taskset -c " + + client_cpuset_cpus + + " " + + benchmark_command_str + ) logging.info( "Running memtier benchmark command {}".format( benchmark_command_str @@ -1037,7 +1042,9 @@ def data_prepopulation_step( if benchmark_local_install: logging.info("Running memtier benchmark outside of docker") - preload_command_str = "taskset -c " + client_cpuset_cpus + " " + preload_command_str + preload_command_str = ( + "taskset -c " + client_cpuset_cpus + " " + preload_command_str + ) logging.info( "Pre-loading using memtier benchmark command {}".format( preload_command_str