diff --git a/utils/tests/test_data/test-suites/memtier_benchmark-10keys-100B-expire-use-case-with-variant.yml b/utils/tests/test_data/test-suites/memtier_benchmark-10keys-100B-expire-use-case-with-variant.yml deleted file mode 100644 index fd29eaf7..00000000 --- a/utils/tests/test_data/test-suites/memtier_benchmark-10keys-100B-expire-use-case-with-variant.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 0.4 -name: "memtier_benchmark-10keys-100B-expire-use-case" -description: "Runs memtier_benchmark, for a keyspace length of 1M keys - with a data size of 100 Bytes for each key, which 50% of the keys have expiration set during the benchmark." -dbconfig: - configuration-parameters: - save: '""' - preload_tool: - run_image: redislabs/memtier_benchmark:edge - tool: memtier_benchmark - arguments: '"--command" "SETEX __key__ 360 __value__" "--command-key-pattern" "P" "-c" "5" "-t" "2" "--hide-histogram" "--key-minimum" 1 "--key-maximum" "10"' -tested-commands: - - SET - - SETX - - GET -redis-topologies: - - oss-standalone -build-variants: - - abc -clientconfig: - run_image: redislabs/memtier_benchmark:edge - tool: memtier_benchmark - arguments: '"--key-minimum" 1 "--key-maximum" "10" --command "SETEX __key__ 10 __value__" --command-key-pattern="R" --command "SET __key__ __value__" --command-key-pattern="R" --command "GET __key__" --command-key-pattern="R" -c 5 -t 1 --hide-histogram --test-time 10' - resources: - requests: - cpus: "1" - memory: "2g" -exporter: - redistimeseries: - break_by: - - version - - commit - timemetric: '$."ALL STATS".Runtime."Start time"' - metrics: - - '$."ALL STATS".Totals."Ops/sec"' - - '$."ALL STATS".Totals."Latency"' - - '$."ALL STATS".Totals."Misses/sec"' - - '$."ALL STATS".Totals."Percentile Latencies"."p50.00"' diff --git a/utils/tests/test_data/test-suites/memtier_benchmark-2keys-stream-5-entries-xread-all-entries.yml b/utils/tests/test_data/test-suites/memtier_benchmark-2keys-stream-5-entries-xread-all-entries.yml new file mode 100644 index 00000000..41f84fe7 --- /dev/null +++ b/utils/tests/test_data/test-suites/memtier_benchmark-2keys-stream-5-entries-xread-all-entries.yml @@ -0,0 +1,44 @@ +version: 0.4 +name: memtier_benchmark-2keys-stream-5-entries-xread-all-entries +description: 'Runs memtier_benchmark, for a keyspace length of 2 STREAM keys with 5 entries on each stream. We query both streams on the same command using XREAD with range of all entries. ' +dbconfig: +- configuration-parameters: + - save: '""' +- init_commands: + - xadd key-1 * field value + - xadd key-1 * field value + - xadd key-1 * field value + - xadd key-1 * field value + - xadd key-1 * field value + - xadd key-2 * field value + - xadd key-2 * field value + - xadd key-2 * field value + - xadd key-2 * field value + - xadd key-2 * field value +tested-commands: +- xread +redis-topologies: +- oss-standalone +build-variants: +- gcc:8.5.0-amd64-debian-buster-default +clientconfig: + run_image: redislabs/memtier_benchmark:edge + tool: memtier_benchmark + arguments: --command="XREAD STREAMS key-1 key-2 0 0" --hide-histogram --test-time 5 + resources: + requests: + cpus: '4' + memory: 2g +exporter: + redistimeseries: + break_by: + - version + - commit + timemetric: $."ALL STATS".Runtime."Start time" + metrics: + - $."ALL STATS".Totals."Ops/sec" + - $."ALL STATS".Totals."Latency" + - $."ALL STATS".Totals."Misses/sec" + - $."ALL STATS".Totals."Percentile Latencies"."p50.00" +tested-groups: +- stream diff --git a/utils/tests/test_runner.py b/utils/tests/test_runner.py index 0ee99486..7ec235f3 100644 --- a/utils/tests/test_runner.py +++ b/utils/tests/test_runner.py @@ -167,7 +167,7 @@ def test_run_client_runner_logic(): args = parser.parse_args( args=[ "--test", - "../../utils/tests/test_data/test-suites/memtier_benchmark-10keys-100B-expire-use-case-with-variant.yml", + "../../utils/tests/test_data/test-suites/memtier_benchmark-2keys-stream-5-entries-xread-all-entries.yml", "--db_server_host", "{}".format(db_host), "--db_server_port", @@ -182,13 +182,13 @@ def test_run_client_runner_logic(): r = redis.Redis(host=db_host, port=db_port_int) total_keys = r.info("keyspace")["db0"]["keys"] - assert total_keys == 10 + assert total_keys == 2 # run while pushing to redistimeseries args = parser.parse_args( args=[ "--test", - "../../utils/tests/test_data/test-suites/memtier_benchmark-10keys-100B-expire-use-case-with-variant.yml", + "../../utils/tests/test_data/test-suites/memtier_benchmark-2keys-stream-5-entries-xread-all-entries.yml", "--datasink_push_results_redistimeseries", "--datasink_redistimeseries_host", "{}".format(db_host), @@ -208,7 +208,10 @@ def test_run_client_runner_logic(): r = redis.Redis(host=db_host, port=db_port_int) total_keys = r.info("keyspace")["db0"]["keys"] - assert total_keys == 10 + assert total_keys == 2 + rts = redis.Redis(host=db_host, port=db_port_int) + total_keys = rts.info("keyspace")["db0"]["keys"] + assert total_keys > 0 def test_extract_testsuites(): @@ -250,4 +253,4 @@ def test_extract_testsuites(): ] ) tests = extract_testsuites(args) - assert len(tests) == 3 + assert len(tests) == 2