From: John Spray <john.spray@redhat.com>
Date: Fri, 18 Jul 2014 14:54:13 +0000 (+0100)
Subject: mon/MDSMonitor: fix msg on idempotent `fs rm`
X-Git-Tag: v0.84~91^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b936a276e3263657e996d6f9f50f543ea19ee090;p=ceph.git

mon/MDSMonitor: fix msg on idempotent `fs rm`

Was outputting trailing "unrecognised command"
because we returned 0 instead of setting r=0.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 34b9632338ed8..d0c9c7e713317 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1068,7 +1068,8 @@ bool MDSMonitor::management_command(
     if (!pending_mdsmap.get_enabled() || fs_name != pending_mdsmap.fs_name) {
         // Consider absence success to make deletes idempotent
         ss << "filesystem '" << fs_name << "' does not exist";
-        return 0;
+        r = 0;
+        return true;
     }
 
     // Check that no MDS daemons are active