]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MDSMonitor: fix msg on idempotent `fs rm`
authorJohn Spray <john.spray@redhat.com>
Fri, 18 Jul 2014 14:54:13 +0000 (15:54 +0100)
committerJohn Spray <john.spray@redhat.com>
Fri, 18 Jul 2014 15:53:48 +0000 (16:53 +0100)
Was outputting trailing "unrecognised command"
because we returned 0 instead of setting r=0.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mon/MDSMonitor.cc

index 34b9632338ed845519ca397399d71e39ced8a9bb..d0c9c7e713317dd367dfb5559ac51079380cda6d 100644 (file)
@@ -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