Merge branch 'main' of github.com:redis/redis-benchmarks-specification

Author: filipecosta90

redis_benchmarks_specification/__runner__/runner.py

@@ -506,17 +506,6 @@ def process_self_contained_coordinator_stream(
                             )
                             pass
 
-                if preserve_temporary_client_dirs is True:
-                    logging.info(
-                        "Preserving temporary client dir {}".format(
-                            temporary_dir_client
-                        )
-                    )
-                else:
-                    logging.info(
-                        "Removing temporary client dir {}".format(temporary_dir_client)
-                    )
-                    shutil.rmtree(temporary_dir_client, ignore_errors=True)
                 if client_aggregated_results_folder != "":
                     os.makedirs(client_aggregated_results_folder, exist_ok=True)
                     dest_fpath = "{}/{}".format(
@@ -531,6 +520,23 @@ def process_self_contained_coordinator_stream(
                     shutil.copy(full_result_path, dest_fpath)
                 overall_result &= test_result
 
+                if preserve_temporary_client_dirs is True:
+                    logging.info(
+                        "Preserving temporary client dir {}".format(
+                            temporary_dir_client
+                        )
+                    )
+                else:
+                    if "redis-benchmark" in benchmark_tool:
+                        os.remove(full_result_path)
+                        logging.info(
+                            "Removing temporary JSON file".format(full_result_path)
+                        )
+                    shutil.rmtree(temporary_dir_client, ignore_errors=True)
+                    logging.info(
+                        "Removing temporary client dir {}".format(temporary_dir_client)
+                    )
+
     table_name = "Results for entire test-suite".format(test_name)
     results_matrix_headers = [
         "Test Name",

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-load-hash-5-fields-with-1000B-values-pipeline-10.yml

@@ -0,0 +1,35 @@
+version: 0.4
+name: "memtier_benchmark-10Mkeys-load-hash-5-fields-with-1000B-values-pipeline-10"
+description: "Runs memtier_benchmark, for a keyspace length of 10M keys
+              loading HASHES with 5 fields each.
+              Each field value has a data size of 1000 Bytes."
+dbconfig:
+  configuration-parameters:
+    save: '""'
+tested-commands:
+  - HSET
+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: '--test-time 180 "--pipeline" "10" "--data-size" "1000" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" "--command-key-pattern" "P" --key-minimum=1 --key-maximum 10000000 -c 50 -t 4 --hide-histogram'
+  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"'

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-load-hash-5-fields-with-1000B-values.yml

@@ -0,0 +1,35 @@
+version: 0.4
+name: "memtier_benchmark-10Mkeys-load-hash-5-fields-with-1000B-values"
+description: "Runs memtier_benchmark, for a keyspace length of 10M keys
+              loading HASHES with 5 fields each.
+              Each field value has a data size of 1000 Bytes."
+dbconfig:
+  configuration-parameters:
+    save: '""'
+tested-commands:
+  - HSET
+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: '--test-time 180 "--data-size" "1000" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -c 50 -t 4 --hide-histogram'
+  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"'

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-load-hash-5-fields-with-100B-values-pipeline-10.yml

@@ -17,7 +17,7 @@ build-variants:
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--pipeline" "10" "--data-size" "100" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" "--command-key-pattern" "P" --key-minimum=1 --key-maximum 10000000 -n 50000 -c 50 -t 4 --hide-histogram'
+  arguments: '"--pipeline" "10" "--data-size" "100" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" "--command-key-pattern" "P" --key-minimum=1 --key-maximum 10000000 -c 50 -t 4 --hide-histogram --test-time=180'
   resources:
     requests:
       cpus: "4"

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-load-hash-5-fields-with-100B-values.yml

@@ -17,7 +17,7 @@ build-variants:
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--data-size" "100" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -n 50000 -c 50 -t 4 --hide-histogram'
+  arguments: '--test-time 180 "--data-size" "100" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -c 50 -t 4 --hide-histogram'
   resources:
     requests:
       cpus: "4"

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-load-hash-5-fields-with-10B-values-pipeline-10.yml

@@ -17,7 +17,7 @@ build-variants:
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--pipeline" "10" "--data-size" "10" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -n 50000 -c 50 -t 4 --hide-histogram'
+  arguments: '--test-time 180 "--pipeline" "10" "--data-size" "10" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -c 50 -t 4 --hide-histogram'
   resources:
     requests:
       cpus: "4"

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-load-hash-5-fields-with-10B-values.yml

@@ -17,7 +17,7 @@ build-variants:
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--data-size" "10" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -n 50000 -c 50 -t 4 --hide-histogram'
+  arguments: '--test-time 180 "--data-size" "10" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 10000000 -c 50 -t 4 --hide-histogram'
   resources:
     requests:
       cpus: "4"

redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-hash-5-fields-with-1000B-values-pipeline-10.yml

@@ -17,7 +17,7 @@ build-variants:
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--pipeline" "10" "--data-size" "1000" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 -n 5000 -c 50 -t 4 --hide-histogram'
+  arguments: '--test-time 180 "--pipeline" "10" "--data-size" "1000" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 -c 50 -t 4 --hide-histogram'
   resources:
     requests:
       cpus: "4"

redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-hash-5-fields-with-1000B-values.yml

@@ -17,7 +17,7 @@ build-variants:
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--data-size" "1000" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 -n 5000 -c 50 -t 4 --hide-histogram'
+  arguments: '--test-time 180 "--data-size" "1000" --command "HSET __key__ field1 __data__ field2 __data__ field3 __data__ field4 __data__ field5 __data__" --command-key-pattern="P" --key-minimum=1 --key-maximum 1000000 -c 50 -t 4 --hide-histogram'
   resources:
     requests:
       cpus: "4"