Merge pull request #121 from RedisLabsModules/cluster_node_timeout

added cluster node timeout config

Author: DvirDukhan

README.md

@@ -32,6 +32,7 @@ usage: RLTest [-h] [--version] [--module MODULE] [--module-args MODULE_ARGS]
               [--cluster_address CLUSTER_ADDRESS]
               [--oss_password OSS_PASSWORD]
               [--cluster_credentials CLUSTER_CREDENTIALS]
+              [--cluster_node_timeout CLUSTER_NODE_TIMEOUT]
               [--internal_password INTERNAL_PASSWORD]
               [--oss-redis-path OSS_REDIS_PATH]
               [--enterprise-redis-path ENTERPRISE_REDIS_PATH]
@@ -83,6 +84,8 @@ optional arguments:
                         enterprise cluster cluster_credentials
                         "username:password", relevent only when running with
                         cluster_existing-env (default: None)
+  --cluster_node_timeout CLUSTER_NODE_TIMEOUT
+                        cluster node timeout in milliseconds
   --internal_password INTERNAL_PASSWORD
                         Give an ability to execute commands on shards
                         directly, relevent only when running with

RLTest/__main__.py

@@ -133,6 +133,10 @@ def do_normal_conn(self, line):
     '--oss_password', default=None,
     help='set redis password, relevant for oss and oss-cluster environment')
 
+parser.add_argument(
+    '--cluster_node_timeout', default=5000,
+    help='sets the node timeout on cluster in milliseconds')
+
 parser.add_argument(
     '--cluster_credentials',
     help='enterprise cluster cluster_credentials "username:password", relevent only when running with cluster_existing-env')
@@ -396,6 +400,7 @@ def __init__(self):
         Defaults.tls_key_file = self.args.tls_key_file
         Defaults.tls_ca_cert_file = self.args.tls_ca_cert_file
         Defaults.oss_password = self.args.oss_password
+        Defaults.cluster_node_timeout = self.args.cluster_node_timeout
         if Defaults.use_unix and Defaults.use_slaves:
             raise Exception('Cannot use unix sockets with slaves')
 

RLTest/env.py

@@ -127,6 +127,7 @@ class Defaults:
     use_unix = False
     randomize_ports = False
     oss_password = None
+    cluster_node_timeout = None
 
     def getKwargs(self):
         kwargs = {
@@ -165,7 +166,7 @@ def __init__(self, testName=None, testDescription=None, module=None,
                  moduleArgs=None, env=None, useSlaves=None, shardsCount=None, decodeResponses=None,
                  useAof=None, useRdbPreamble=None, forceTcp=False, useTLS=False, tlsCertFile=None, tlsKeyFile=None,
                  tlsCaCertFile=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None,
-                 redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False):
+                 redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False, clusterNodeTimeout = None):
 
         self.testName = testName if testName else '%s.%s' % (inspect.getmodule(inspect.currentframe().f_back).__name__, inspect.currentframe().f_back.f_code.co_name)
         self.testName = self.testName.replace(' ', '_')
@@ -196,6 +197,7 @@ def __init__(self, testName=None, testDescription=None, module=None,
         self.redisBinaryPath = expandBinary(redisBinaryPath) if redisBinaryPath else Defaults.binary
         self.dmcBinaryPath = expandBinary(dmcBinaryPath) if dmcBinaryPath else Defaults.proxy_binary
         self.redisEnterpriseBinaryPath = expandBinary(redisEnterpriseBinaryPath) if redisEnterpriseBinaryPath else Defaults.re_binary
+        self.clusterNodeTimeout = clusterNodeTimeout if clusterNodeTimeout else Defaults.cluster_node_timeout
 
         self.assertionFailedSummary = []
 
@@ -291,6 +293,7 @@ def getEnvKwargs(self):
             'tlsCertFile': self.tlsCertFile,
             'tlsKeyFile': self.tlsKeyFile,
             'tlsCaCertFile': self.tlsCaCertFile,
+            'clusterNodeTimeout': self.clusterNodeTimeout
         }
         return kwargs
 

RLTest/redis_std.py

@@ -21,7 +21,7 @@ class StandardEnv(object):
     def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None, outputFilesFormat=None,
                  dbDirPath=None, useSlaves=False, serverId=1, password=None, libPath=None, clusterEnabled=False, decodeResponses=False,
                  useAof=False, useRdbPreamble=True, debugger=None, noCatch=False, unix=False, verbose=False, useTLS=False, tlsCertFile=None,
-                 tlsKeyFile=None, tlsCaCertFile=None):
+                 tlsKeyFile=None, tlsCaCertFile=None, clusterNodeTimeout = None):
         self.uuid = uuid.uuid4().hex
         self.redisBinaryPath = os.path.expanduser(redisBinaryPath) if redisBinaryPath.startswith(
             '~/') else redisBinaryPath
@@ -52,6 +52,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
         self.tlsCertFile = tlsCertFile
         self.tlsKeyFile = tlsKeyFile
         self.tlsCaCertFile = tlsCaCertFile
+        self.clusterNodeTimeout = clusterNodeTimeout
 
         if port > 0:
             self.port = port
@@ -184,7 +185,7 @@ def createCmdArgs(self, role):
         if self.clusterEnabled and role is not SLAVE:
             # creating .cluster.conf in /tmp as lock fails on NFS
             cmdArgs += ['--cluster-enabled', 'yes', '--cluster-config-file', '/tmp/' + self._getFileName(role, '.cluster.conf'),
-                        '--cluster-node-timeout', '5000']
+                        '--cluster-node-timeout', '5000' if self.clusterNodeTimeout is None else str(self.clusterNodeTimeout)]
             if self.useTLS:
                 cmdArgs += ['--tls-cluster', 'yes']
         if self.useAof:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "RLTest"
-version = "0.4.1"
+version = "0.4.2"
 description="Redis Labs Test Framework, allow to run tests on redis and modules on a variety of environments"
 authors = ["RedisLabs <[email protected]>"]
 license = "BSD-3-Clause"

tests/unit/test_redis_std.py

@@ -386,4 +386,11 @@ def test_get_connection_by_key(self):
             key = 'x{%i}' % i
             con = std_env.getConnectionByKey(key, "set")
             assert(con.set(key, "1"))
+        std_env.stopEnv()
+
+    def test_cluster_node_timeout(self):
+        std_env = StandardEnv(redisBinaryPath=REDIS_BINARY, outputFilesFormat='%s-test', dbDirPath=self.test_dir, clusterNodeTimeout=60000)
+        std_env.startEnv()
+        con = std_env.getConnection()
+        assert(con.execute_command("CONFIG", "GET", "cluster-node-timeout"), "60000")
         std_env.stopEnv()