mirror of
https://github.com/ceph/ceph
synced 2025-01-29 22:43:40 +00:00
Merge PR #34215 into master
* refs/pull/34215/head: cephadm: Fix trucated output of `mgr dump` Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
commit
932d152f35
@ -640,6 +640,12 @@ def call(command, # type: List[str]
|
||||
message = message_b.decode('utf-8')
|
||||
if isinstance(message_b, str):
|
||||
message = message_b
|
||||
if stop and message:
|
||||
# process has terminated, but have more to read still, so not stopping yet
|
||||
# (os.read returns '' when it encounters EOF)
|
||||
stop = False
|
||||
if not message:
|
||||
continue
|
||||
if fd == process.stdout.fileno():
|
||||
out += message
|
||||
message = out_buffer + message
|
||||
|
Loading…
Reference in New Issue
Block a user