Incorrect timeout evaluation in long_running

Unit testing indicated that `if not timeout ...` was not getting evaluated correctly. This patch switches to checking if timeout is not None ... Signed-off-by: Pragadeeswaran Sathyanarayanan <[email protected]>
psathyan · Jul 17, 2024 · c05bc36 · c05bc36
1 parent 93d0509
commit c05bc36
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/ceph/ceph.py b/ceph/ceph.py
@@ -1524,8 +1524,6 @@ def long_running(self, **kw):
             channel.set_combine_stderr(True)
             channel.exec_command(cmd)
 
-            # Channel timeout is per operation. Waiting for a specified duration or
-            # command execution completion.
             if timeout:
                 _end_time = datetime.datetime.now() + datetime.timedelta(
                     seconds=timeout
@@ -1543,7 +1541,8 @@ def long_running(self, **kw):
 
                         data = channel.recv(1024)
 
-                if not timeout and _end_time > datetime.datetime.now():
+                # time check - raise exception when exceeded.
+                if timeout is not None and _end_time > datetime.datetime.now():
                     channel.close()
                     raise SocketTimeoutException(
                         f"{cmd} failed to complete within {timeout}s"