From: Redouane Kachach <rkachach@redhat.com>
Date: Mon, 11 Apr 2022 14:13:05 +0000 (+0200)
Subject: mgr/cephadm: fixing call method timeout handling
X-Git-Tag: v17.2.1~73^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5667e1382a7629a6d0d33e1880ea5ec6eecce5e;p=ceph.git

mgr/cephadm: fixing call method timeout handling
Fixes: https://tracker.ceph.com/issues/55265

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 55d42d0c31a5414cb2beac9273faa7123efb8709)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 16ce722af613..1f022cfc466d 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1679,9 +1679,8 @@ 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