From c6e63de4fc51ca54ca2f60ef800222a1b3cfde87 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 12 May 2022 10:09:43 -0400 Subject: [PATCH] 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 --- src/cephadm/cephadm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index a946ab240c46..f5d276ae231c 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 -- 2.47.3