From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 23 Jun 2017 10:26:02 +0000 (+0800)
Subject: mon/OSDMonitor: set result code properly if we fail to process "swap-bucket"
X-Git-Tag: v12.1.1~292^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ec1b974be9b54d1b77552f4e91f462fe44a753f5;p=ceph-ci.git

mon/OSDMonitor: set result code properly if we fail to process "swap-bucket"

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ea45ddfb663..ee49e404d67 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7461,6 +7461,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     int r = newcrush.swap_bucket(g_ceph_context, sid, did);
     if (r < 0) {
       ss << "failed to swap bucket contents: " << cpp_strerror(r);
+      err = r;
       goto reply;
     }
     ss << "swapped bucket of " << source << " to " << dest;