From: Kiefer Chang <kiefer.chang@suse.com>
Date: Wed, 27 May 2020 06:43:37 +0000 (+0800)
Subject: mgr: include retval in MonCommandFailed exception
X-Git-Tag: v16.1.0~2211^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35194%2Fhead;p=ceph.git

mgr: include retval in MonCommandFailed exception

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 8cc419b764d2..49c94826b3a8 100644
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -1093,7 +1093,7 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin):
 
         r = HandleCommandResult(*self.mon_command(cmd_dict))
         if r.retval:
-            raise MonCommandFailed(f'{cmd_dict["prefix"]} failed: {r.stderr}')
+            raise MonCommandFailed(f'{cmd_dict["prefix"]} failed: {r.stderr} retval: {r.retval}')
         return r
 
     def mon_command(self, cmd_dict):