TFA: regression issue with long_running method

Incorrect check was performed when evaluating maximum allocated run duration. This patch fixes the patch statement. Signed-off-by: Pragadeeswaran Sathyanarayanan <[email protected]>
psathyan · Jul 18, 2024 · 18e600d · 18e600d
1 parent 1d8391a
commit 18e600d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ceph/ceph.py b/ceph/ceph.py
@@ -1518,6 +1518,7 @@ def long_running(self, **kw):
 
         try:
             channel = ssh().get_transport().open_session()
+            channel.settimeout(timeout)
 
             # A mismatch between stdout and stderr streams have been observed hence
             # combining the streams and logging is set to debug level only.
@@ -1542,7 +1543,7 @@ def long_running(self, **kw):
                         data = channel.recv(1024)
 
                 # time check - raise exception when exceeded.
-                if timeout is not None and _end_time > datetime.datetime.now():
+                if timeout and datetime.datetime.now() > _end_time:
                     channel.close()
                     raise SocketTimeoutException(
                         f"{cmd} failed to complete within {timeout}s"