cephadm: Revert "mgr/cephadm: fixing call method timeout handling"

This reverts commit 55d42d0c31a5414cb2beac9273faa7123efb8709.

Fixes: https://tracker.ceph.com/issues/55623
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c6e63de4fc51ca54ca2f60ef800222a1b3cfde87)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5215d7c2ff336a4aa054c47f7ad5ffb10d879027..30de85274a656c811b9ca90d89b87de7ecb7ff5c 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1705,8 +1705,9 @@ def call(ctx: CephadmContext,
         assert process.stdout
         assert process.stderr
         try:
+            stdout, stderr = await asyncio.gather(tee(process.stdout),
+                                                  tee(process.stderr))
             returncode = await asyncio.wait_for(process.wait(), timeout)
-            stdout, stderr = await asyncio.gather(tee(process.stdout), tee(process.stderr))
         except asyncio.TimeoutError:
             logger.info(prefix + f'timeout after {timeout} seconds')
             return '', '', 124