From: Adam King <adking@redhat.com>
Date: Thu, 12 May 2022 14:09:43 +0000 (-0400)
Subject: cephadm: Revert "mgr/cephadm: fixing call method timeout handling"
X-Git-Tag: v18.0.0~876^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6e63de4fc51ca54ca2f60ef800222a1b3cfde87;p=ceph-ci.git

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>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index a946ab240c4..f5d276ae231 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1706,8 +1706,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