]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fixing call method timeout handling 45855/head
authorRedouane Kachach <rkachach@redhat.com>
Mon, 11 Apr 2022 14:13:05 +0000 (16:13 +0200)
committerRedouane Kachach <rkachach@redhat.com>
Fri, 22 Apr 2022 15:11:39 +0000 (17:11 +0200)
Fixes: https://tracker.ceph.com/issues/55265
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
src/cephadm/cephadm

index 004219bb6a373a9db5db1f801e49986f3cc02498..11b42d083a71648c649f6489e2a184ff1ef6c3d8 100755 (executable)
@@ -1611,9 +1611,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