Merge pull request #232 from RedisLabsModules/razmon-add_dual_mode

Add dualTLS mode

Author: raz-mon

README.md

@@ -163,7 +163,7 @@ optional arguments:
   --unix                Use Unix domain sockets instead of TCP (default:
                         False)
   --randomize-ports     Randomize Redis listening port assignment rather
-                        thanusing default port (default: False)
+                        than using default port (default: False)
   --collect-only        Collect the tests and exit (default: False)
   --tls                 Enable TLS Support and disable the non-TLS port
                         completely. TLS connections will be available at the
@@ -175,6 +175,10 @@ optional arguments:
   --tls-ca-cert-file TLS_CA_CERT_FILE
                         /path/to/ca.crt (default: None)
 
+  --dualTLS             Initialize both TLS and non-TLS ports for all shards.
+                        The non-TLS ports will be the TLS ports + 1500.
+                        Only effective when TLS is active (see `useTLS`).
+
 ```
 
 ## Sample usages

RLTest/env.py

@@ -152,6 +152,7 @@ class Defaults:
     terminate_retry_secs = None
     protocol = 2
     redis_config_file = None
+    dualTLS = False
 
     def getKwargs(self):
         kwargs = {
@@ -200,7 +201,7 @@ def __init__(self, testName=None, testDescription=None, module=None,
                  tlsCaCertFile=None, tlsPassphrase=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None,
                  redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False, clusterNodeTimeout = None,
                  freshEnv=False, enableDebugCommand=None, enableModuleCommand=None, enableProtectedConfigs=None, protocol=None,
-                 terminateRetries=None, terminateRetrySecs=None, redisConfigFile=None):
+                 terminateRetries=None, terminateRetrySecs=None, redisConfigFile=None, dualTLS=False):
 
         self.testName = testName if testName else Defaults.curr_test_name
         if self.testName is None:
@@ -252,6 +253,8 @@ def __init__(self, testName=None, testDescription=None, module=None,
 
         self.assertionFailedSummary = []
 
+        self.dualTLS = dualTLS if dualTLS else Defaults.dualTLS
+
         if not freshEnv and Env.RTestInstance and Env.RTestInstance.currEnv and self.compareEnvs(Env.RTestInstance.currEnv):
             self.envRunner = Env.RTestInstance.currEnv.envRunner
         else:
@@ -367,6 +370,7 @@ def getEnvKwargs(self):
             'terminateRetries': self.terminateRetries,
             'terminateRetrySecs': self.terminateRetrySecs,
             'redisConfigFile': self.redisConfigFile,
+            'dualTLS': self.dualTLS
         }
         return kwargs
 

RLTest/redis_cluster.py

@@ -67,10 +67,6 @@ def waitCluster(self, timeout_sec=40):
                     ok += 1
             if ok == len(self.shards):
                 for shard in self.shards:
-                    try:
-                        shard.getConnection().execute_command('FT.CLUSTERREFRESH')
-                    except Exception:
-                        pass
                     try:
                         shard.getConnection().execute_command('SEARCH.CLUSTERREFRESH')
                     except Exception:

RLTest/redis_std.py

@@ -23,7 +23,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
                  useAof=False, useRdbPreamble=True, debugger=None, sanitizer=None, noCatch=False, noLog=False, unix=False, verbose=False, useTLS=False,
                  tlsCertFile=None, tlsKeyFile=None, tlsCaCertFile=None, clusterNodeTimeout=None, tlsPassphrase=None, enableDebugCommand=False, protocol=2,
                  terminateRetries=None, terminateRetrySecs=None, enableProtectedConfigs=False, enableModuleCommand=False, loglevel=None,
-                 redisConfigFile=None
+                 redisConfigFile=None, dualTLS=False
                  ):
         self.uuid = uuid.uuid4().hex
         self.redisBinaryPath = os.path.expanduser(redisBinaryPath) if redisBinaryPath.startswith(
@@ -71,6 +71,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
         self.terminateRetries = terminateRetries
         self.terminateRetrySecs = terminateRetrySecs
         self.redisConfigFile = redisConfigFile
+        self.dualTLS = dualTLS
 
         if port > 0:
             self.port = port
@@ -187,7 +188,7 @@ def createCmdArgs(self, role):
 
         if self.port > -1:
             if self.useTLS:
-                cmdArgs += ['--port', str(0), '--tls-port', str(self.getPort(role))]
+                cmdArgs += ['--port', str(self.getPort(role) + 1500) if self.dualTLS else str(0), '--tls-port', str(self.getPort(role))]
             else:
                 cmdArgs += ['--port', str(self.getPort(role))]
         else: