Avoid waiting on connection when server is dead (#187)

Author: rafie

RLTest/redis_cluster.py

@@ -183,7 +183,7 @@ def checkExitCode(self):
         return True
 
     def isUp(self):
-        return self.envIsUp or self.waitCluster()
+        return self.envIsUp or self.envIsHealthy and self.waitCluster()
 
     def isHealthy(self):
         return self.envIsHealthy

RLTest/redis_std.py

@@ -245,8 +245,8 @@ def createCmdOSEnv(self, role):
         osenv["ASAN_OPTIONS"] = "{OPT}:log_path={DIR}".format(OPT=asan_options, DIR=san_log)
         return osenv
 
-    def waitForRedisToStart(self, con):
-        wait_for_conn(con, retries=1000 if self.debugger else 200)
+    def waitForRedisToStart(self, con, proc):
+        wait_for_conn(con, proc, retries=1000 if self.debugger else 200)
         self._waitForAOFChild(con)
 
     def getPid(self, role):
@@ -313,22 +313,30 @@ def startEnv(self, masters = True, slaves = True):
             print(Colors.Green("Redis master command: " + ' '.join(self.masterCmdArgs)))
         if masters and self.masterProcess is None:
             self.masterProcess = subprocess.Popen(args=self.masterCmdArgs, env=self.masterOSEnv, **options)
-            con = self.getConnection()
-            self.waitForRedisToStart(con)
+            time.sleep(0.1)
+            if self._isAlive(self.masterProcess):
+                con = self.getConnection()
+                self.waitForRedisToStart(con, self.masterProcess)
+            else:
+                self.masterProcess = None
         if self.useSlaves and slaves and self.slaveProcess is None:
             if self.verbose:
                 print(Colors.Green("Redis slave command: " + ' '.join(self.slaveCmdArgs)))
             self.slaveProcess = subprocess.Popen(args=self.slaveCmdArgs, env=self.slaveOSEnv, **options)
-            con = self.getSlaveConnection()
-            self.waitForRedisToStart(con)
-        self.envIsUp = True
+            time.sleep(0.1)
+            if self._isAlive(self.slaveProcess):
+                con = self.getSlaveConnection()
+                self.waitForRedisToStart(con, self.slaveProcess)
+            else:
+                self.slaveProcess = None
+
+        self.envIsUp = self.masterProcess is not None or self.slaveProcess is not None
         self.envIsHealthy = self.masterProcess is not None and (self.slaveProcess is not None if self.useSlaves else True)
 
     def _isAlive(self, process):
         if not process:
             return False
-        # Check if child process has terminated. Set and return returncode
-        # attribute
+        # check if child process has terminated
         if process.poll() is None:
             return True
         return False

RLTest/utils.py

@@ -6,10 +6,12 @@
 import redis
 import itertools
 
-def wait_for_conn(conn, retries=20, command='PING', shouldBe=True):
+def wait_for_conn(conn, proc, retries=20, command='PING', shouldBe=True):
     """Wait until a given Redis connection is ready"""
     err1 = ''
     while retries > 0:
+        if proc.poll() is not None:
+            raise Exception(f'Redis server is dead (pid={proc.pid})')
         try:
             if conn.execute_command(command) == shouldBe:
                 return conn