Skip to content

Add parameter to allow starting a cluster with TLS, that does not use TLS connections for inter-shard communication #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add parameter to allow starting a cluster with TLS, that does not use TLS connections for inter-shard communication #233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed8149a
Add parameter to allow starting a cluster with TLS, that does not use…
raz-mon Jun 7, 2025
78b2de4
Fix initialization
raz-mon Jun 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ optional arguments:
--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`).
(default: False)
--tlsCluster Enable TLS for cluster communication. Only effective
when TLS is active (see `useTLS`) and when running
in cluster mode. (default: True)

```

Expand Down
8 changes: 6 additions & 2 deletions RLTest/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ class Defaults:
protocol = 2
redis_config_file = None
dualTLS = False
tlsCluster = True

def getKwargs(self):
kwargs = {
Expand Down Expand Up @@ -201,7 +202,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, dualTLS=False):
terminateRetries=None, terminateRetrySecs=None, redisConfigFile=None, dualTLS=False, tlsCluster=True):

self.testName = testName if testName else Defaults.curr_test_name
if self.testName is None:
Expand Down Expand Up @@ -255,6 +256,8 @@ def __init__(self, testName=None, testDescription=None, module=None,

self.dualTLS = dualTLS if dualTLS else Defaults.dualTLS

self.tlsCluster = tlsCluster if tlsCluster else Defaults.tlsCluster

if not freshEnv and Env.RTestInstance and Env.RTestInstance.currEnv and self.compareEnvs(Env.RTestInstance.currEnv):
self.envRunner = Env.RTestInstance.currEnv.envRunner
else:
Expand Down Expand Up @@ -370,7 +373,8 @@ def getEnvKwargs(self):
'terminateRetries': self.terminateRetries,
'terminateRetrySecs': self.terminateRetrySecs,
'redisConfigFile': self.redisConfigFile,
'dualTLS': self.dualTLS
'dualTLS': self.dualTLS,
'tlsCluster': self.tlsCluster,
}
return kwargs

Expand Down
5 changes: 3 additions & 2 deletions RLTest/redis_std.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, dualTLS=False
redisConfigFile=None, dualTLS=False, tlsCluster=True
):
self.uuid = uuid.uuid4().hex
self.redisBinaryPath = os.path.expanduser(redisBinaryPath) if redisBinaryPath.startswith(
Expand Down Expand Up @@ -72,6 +72,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
self.terminateRetrySecs = terminateRetrySecs
self.redisConfigFile = redisConfigFile
self.dualTLS = dualTLS
self.tlsCluster = tlsCluster

if port > 0:
self.port = port
Expand Down Expand Up @@ -230,7 +231,7 @@ def createCmdArgs(self, role):
# 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' if self.clusterNodeTimeout is None else str(self.clusterNodeTimeout)]
if self.useTLS:
if self.useTLS and self.tlsCluster:
cmdArgs += ['--tls-cluster', 'yes']
if self.useAof:
cmdArgs += ['--appendonly', 'yes']
Expand Down