Skip to content

fix(cluster): --use-slaves creates cluster-aware replicas #253

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
fcostaoliveira wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(cluster): --use-slaves creates cluster-aware replicas #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f12cb8
fix(cluster): --use-slaves creates cluster-aware replicas
fcostaoliveira Jun 7, 2026
bc66789
feat(cluster): --replicas-per-shard=N for multiple replicas per shard
fcostaoliveira Jun 7, 2026
f90f9d7
fix(cluster): polish — process-leak guard + named constants + docstring
fcostaoliveira Jun 7, 2026
4808b5f
feat(env): markSlaveDeadByTest API for intentional replica shutdown
Jun 8, 2026
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
8 changes: 8 additions & 0 deletions RLTest/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ def do_normal_conn(self, line):
'--use-slaves', action='store_const', const=True, default=False,
help='run env with slaves enabled')

parser.add_argument(
'--replicas-per-shard', default=1, type=int,
help='Number of replicas per shard when --use-slaves is set '
'(cluster mode only). Default: 1.')

parser.add_argument(
'--shards-count', default=1, type=int,
help='Number shards in bdb')
Expand Down Expand Up @@ -516,6 +521,9 @@ def __init__(self):
Defaults.logdir = self.args.log_dir
Defaults.loglevel = self.args.log_level
Defaults.use_slaves = self.args.use_slaves
if self.args.replicas_per_shard < 1:
raise Exception('--replicas-per-shard must be >= 1')
Defaults.replicas_per_shard = self.args.replicas_per_shard
Defaults.num_shards = self.args.shards_count
Defaults.shards_ports = self.args.shards_ports.split(',') if self.args.shards_ports is not None else None
Defaults.cluster_address = self.args.cluster_address
Expand Down
13 changes: 11 additions & 2 deletions RLTest/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class Defaults:
logdir = None
loglevel = None
use_slaves = False
replicas_per_shard = 1
num_shards = 1
external_addr = 'localhost:6379'
use_unix = False
Expand All @@ -161,6 +162,7 @@ def getKwargs(self):
'moduleArgs': self.module_args,
'port': self.port,
'useSlaves': self.use_slaves,
'replicasPerShard': self.replicas_per_shard,
'useAof': self.use_aof,
'useRdbPreamble': self.use_rdb_preamble,
'dbDirPath': self.logdir,
Expand All @@ -184,7 +186,8 @@ def getKwargs(self):

class Env:
RTestInstance = None
EnvCompareParams = ['module', 'moduleArgs', 'env', 'useSlaves', 'shardsCount', 'useAof',
EnvCompareParams = ['module', 'moduleArgs', 'env', 'useSlaves', 'replicasPerShard',
'shardsCount', 'useAof',
'useRdbPreamble', 'forceTcp', 'enableDebugCommand', 'enableProtectedConfigs',
'enableModuleCommand', 'protocol', 'password']

Expand All @@ -203,7 +206,7 @@ def __init__(self, testName=None, testDescription=None, module=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,
startupGraceSecs=None):
startupGraceSecs=None, replicasPerShard=None):

self.testName = testName if testName else Defaults.curr_test_name
if self.testName is None:
Expand All @@ -220,6 +223,11 @@ def __init__(self, testName=None, testDescription=None, module=None,
self.moduleArgs = fix_modulesArgs(self.module, moduleArgs, Defaults.module_args)
self.env = env if env else Defaults.env
self.useSlaves = useSlaves if useSlaves else Defaults.use_slaves
# Per-test override is rare; default falls back to the global value set
# via --replicas-per-shard. Only meaningful for cluster mode with
# useSlaves; standalone always uses 1 slave.
self.replicasPerShard = (replicasPerShard if replicasPerShard is not None
else Defaults.replicas_per_shard)
self.shardsCount = shardsCount if shardsCount else Defaults.num_shards
self.decodeResponses = decodeResponses if decodeResponses else Defaults.decode_responses
self.useAof = useAof if useAof else Defaults.use_aof
Expand Down Expand Up @@ -351,6 +359,7 @@ def getEnvKwargs(self):
'modulePath': self.module,
'moduleArgs': self.moduleArgs,
'useSlaves': self.useSlaves,
'replicasPerShard': self.replicasPerShard,
'decodeResponses': self.decodeResponses,
'useAof': self.useAof,
'useRdbPreamble': self.useRdbPreamble,
Expand Down
Loading
Loading