From: Tim Serong <tserong@suse.com>
Date: Wed, 2 Nov 2022 03:23:20 +0000 (+1100)
Subject: ceph-crash: fix stderr handling
X-Git-Tag: v16.2.13~182^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=544f5035a6c7880756149c59a8f1b793d1dfd14b;p=ceph.git

ceph-crash: fix stderr handling

Popen.communicate() returns a tuple (stdout, stderr), and stderr
will be of type bytes, hence the need to decode it before checking
if it's an empty string or not.

Fixes: a77b47eeeb5770eeefcf4619ab2105ee7a6a003e
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 45915540559126a652f8d9d105723584cfc63439)
---

diff --git a/src/ceph-crash.in b/src/ceph-crash.in
index 916f0664a945..453efb7aa10d 100755
--- a/src/ceph-crash.in
+++ b/src/ceph-crash.in
@@ -50,7 +50,8 @@ def post_crash(path):
             stderr=subprocess.PIPE,
         )
         f = open(os.path.join(path, 'meta'), 'rb')
-        stderr = pr.communicate(input=f.read())
+        (_, stderr) = pr.communicate(input=f.read())
+        stderr = stderr.decode()
         rc = pr.wait()
         f.close()
         if rc != 0 or stderr != "":