Skip to content

Commit 96a65de

Browse files
authored
protect logs with verbosity (#246)
1 parent b21c1f5 commit 96a65de

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

RLTest/redis_cluster.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def __init__(self, **kwargs):
2626
self.protocol = kwargs.get('protocol', 2)
2727
self.terminateRetries = kwargs.get('terminateRetries', None)
2828
self.terminateRetrySecs = kwargs.get('terminateRetrySecs', None)
29+
self.verbose = kwargs.get('verbose', False)
2930
self.clusterStartTimeout = kwargs.pop('clusterStartTimeout', 40)
3031
startPort = kwargs.pop('port', 10000)
3132
totalRedises = self.shardsCount * (2 if useSlaves else 1)
@@ -126,20 +127,23 @@ def startEnv(self, masters=True, slaves=True):
126127
return # env is already up
127128

128129
total_shards = len(self.shards)
129-
print(Colors.Yellow('Starting cluster with %d shards...' % total_shards))
130+
if self.verbose:
131+
print(Colors.Yellow('Starting cluster with %d shards...' % total_shards))
130132

131133
try:
132134
for i, shard in enumerate(self.shards):
133135
shard.startEnv(masters, slaves)
134-
print(Colors.Yellow(' Started shard %d/%d' % (i + 1, total_shards)))
136+
if self.verbose:
137+
print(Colors.Yellow(' Started shard %d/%d' % (i + 1, total_shards)))
135138
except Exception as e:
136139
print(Colors.Bred('Error starting shard %d: %s' % (i + 1, str(e))))
137140
print(Colors.Bred('Stopping all shards...'))
138141
for shard in self.shards:
139142
shard.stopEnv()
140143
raise
141144

142-
print(Colors.Yellow('Configuring cluster topology...'))
145+
if self.verbose:
146+
print(Colors.Yellow('Configuring cluster topology...'))
143147
slots_per_node = int(16384 / len(self.shards)) + 1
144148
for i, shard in enumerate(self.shards):
145149
con = shard.getConnection()
@@ -159,10 +163,11 @@ def startEnv(self, masters=True, slaves=True):
159163
print(Colors.Bred(' Error assigning slots %d-%d to shard %d: %s' %
160164
(start_slot, end_slot - 1, i + 1, str(e))))
161165

162-
print(Colors.Yellow(' Configured shard %d/%d (slots %d-%d)' %
163-
(i + 1, total_shards, start_slot, min(end_slot - 1, 16383))))
166+
if self.verbose:
167+
print(Colors.Yellow(' Configured shard %d/%d (slots %d-%d)' %
168+
(i + 1, total_shards, start_slot, min(end_slot - 1, 16383))))
164169

165-
self.waitCluster(timeout_sec=self.clusterStartTimeout)
170+
self.waitCluster(timeout_sec=self.clusterStartTimeout, verbose=self.verbose)
166171
self.envIsUp = True
167172
self.envIsHealthy = True
168173

0 commit comments

Comments
 (0)