Added support for yaml array in execute_init_commands (#387)

* Added support for array in execute_init_commands

* Bumping version from 0.9.30 to 0.9.31

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.9.29"
+version = "0.9.31"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/run/common.py

@@ -418,13 +418,16 @@ def check_dbconfig_keyspacelen_requirement(
 
 def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
     cmds = None
+    res = 0
     if dbconfig_keyname in benchmark_config:
         for k in benchmark_config[dbconfig_keyname]:
             if "init_commands" in k:
                 cmds = k["init_commands"]
     if cmds is not None:
         for cmd in cmds:
             is_array = False
+            if type(cmd) == list:
+                is_array = True
             if '"' in cmd:
                 cols = []
                 for lines in csv.reader(
@@ -459,6 +462,7 @@ def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
                             pass
                     else:
                         stdout = r.execute_command(cmd)
+                res = res + 1
                 logging.info("Command reply: {}".format(stdout))
             except redis.connection.ConnectionError as e:
                 logging.error(
@@ -467,6 +471,8 @@ def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
                     )
                 )
 
+    return res
+
 
 def extract_test_feasible_setups(
     benchmark_config, param, default_specs, backwards_compatible=True

tests/test_common.py

@@ -7,7 +7,6 @@
 import yaml
 from redisbench_admin.utils.remote import push_data_to_redistimeseries
 
-
 from redisbench_admin.export.common.common import (
     add_datapoint,
     split_tags_string,
@@ -25,6 +24,7 @@
     dso_check,
     dbconfig_keyspacelen_check,
     common_properties_log,
+    execute_init_commands,
 )
 from redisbench_admin.run_remote.args import create_run_remote_arguments
 
@@ -572,3 +572,26 @@ def test_common_properties_log():
         tf_triggering_env,
         private_key,
     )
+
+
+def test_execute_init_commands():
+    from redis import StrictRedis
+    from redis.exceptions import ConnectionError
+
+    redis_port = 16379
+    try:
+        redis = StrictRedis(port=redis_port)
+        redis.ping()
+        redis.flushall()
+        redis.config_resetstat()
+
+        with open("./tests/test_data/init-commands-array.yml", "r") as yml_file:
+            benchmark_config = yaml.safe_load(yml_file)
+            # no keyspace len check
+            total_cmds = execute_init_commands(benchmark_config, redis)
+            assert total_cmds == 3
+
+        assert b"key" in redis.keys()
+        assert b"key2" in redis.keys()
+    except ConnectionError:
+        pass

tests/test_data/init-commands-array.yml

@@ -0,0 +1,10 @@
+version: 0.4
+name: memtier_benchmark-2keys-lua-evalsha-hset-expire
+description: 'Runs memtier_benchmark, for a keyspace length of 2 HASH keys. This benchmark invokes the execution of a server-side Lua script doing 2 HSET commands and doing EXPIRE on those keys. '
+dbconfig:
+- configuration-parameters:
+  - save: '""'
+- init_commands:
+  - ["SCRIPT", "LOAD" ,"redis.call('hset', 'h1', 'k', 'v');redis.call('hset', 'h2', 'k', 'v');redis.call('expire', 'h1', 3600);redis.call('expire', 'h2', 3600);return redis.call('ping')"]
+  - ["SET", "key", "val"]
+  - '"HSET" "key2" "FIELD" "VAL"'