Skip to content
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

Jump to bottom

Add environment config to disable RDB checksum #122

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add environment config to disable RDB checksum #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions RLTest/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class Defaults:
randomize_ports = False
oss_password = None
cluster_node_timeout = None
disable_rdb_checksum = False

def getKwargs(self):
kwargs = {
Expand All @@ -144,7 +145,8 @@ def getKwargs(self):
'tlsCertFile': self.tls_cert_file,
'tlsKeyFile': self.tls_key_file,
'tlsCaCertFile': self.tls_ca_cert_file,
'password': self.oss_password
'password': self.oss_password,
'rdbchecksum': self.disable_rdb_checksum
}
return kwargs

Expand All @@ -166,7 +168,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, clusterNodeTimeout = None):
redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False, clusterNodeTimeout=None, disableRdbChecksum=False):

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(' ', '_')
Expand All @@ -185,6 +187,7 @@ def __init__(self, testName=None, testDescription=None, module=None,
self.decodeResponses = decodeResponses if decodeResponses else Defaults.decode_responses
self.useAof = useAof if useAof else Defaults.use_aof
self.useRdbPreamble = useRdbPreamble if useRdbPreamble is not None else Defaults.use_rdb_preamble
self.disableRdbChecksum = disableRdbChecksum if disableRdbChecksum else Defaults.disable_rdb_checksum
self.verbose = Defaults.verbose
self.logDir = logDir if logDir else Defaults.logdir
self.forceTcp = forceTcp
Expand Down Expand Up @@ -293,7 +296,8 @@ def getEnvKwargs(self):
'tlsCertFile': self.tlsCertFile,
'tlsKeyFile': self.tlsKeyFile,
'tlsCaCertFile': self.tlsCaCertFile,
'clusterNodeTimeout': self.clusterNodeTimeout
'clusterNodeTimeout': self.clusterNodeTimeout,
'rdbchecksum': self.disableRdbChecksum
}
return kwargs

Expand Down
5 changes: 4 additions & 1 deletion RLTest/redis_std.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, clusterNodeTimeout = None):
tlsKeyFile=None, tlsCaCertFile=None, clusterNodeTimeout=None, rdbchecksum=False):
self.uuid = uuid.uuid4().hex
self.redisBinaryPath = os.path.expanduser(redisBinaryPath) if redisBinaryPath.startswith(
'~/') else redisBinaryPath
Expand Down Expand Up @@ -53,6 +53,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
self.tlsKeyFile = tlsKeyFile
self.tlsCaCertFile = tlsCaCertFile
self.clusterNodeTimeout = clusterNodeTimeout
self.rdbchecksum = rdbchecksum

if port > 0:
self.port = port
Expand Down Expand Up @@ -197,6 +198,8 @@ def createCmdArgs(self, role):
cmdArgs += ['--tls-cert-file', self.getTLSCertFile()]
cmdArgs += ['--tls-key-file', self.getTLSKeyFile()]
cmdArgs += ['--tls-ca-cert-file', self.getTLSCACertFile()]
if self.rdbchecksum:
cmdArgs += ['--rdbchecksum', 'no']

return cmdArgs

Expand Down