From: Sage Weil <sage@inktank.com>
Date: Thu, 20 Jun 2013 18:23:11 +0000 (-0700)
Subject: mds: make 'mds compat rm_*compat' idempotent
X-Git-Tag: v0.65~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4977b88a7cf1eab3b96d96ad4f0257e7b41aaa5b;p=ceph.git

mds: make 'mds compat rm_*compat' idempotent

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 0314f2b2e4d1..5e35b2f9bb43 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -942,7 +942,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
       r = 0;
     } else {
       ss << "compat feature " << f << " not present in " << pending_mdsmap.compat;
-      r = -ENOENT;
+      r = 0;
     }
   } else if (prefix == "mds compat rm_incompat") {
     int64_t f;
@@ -953,7 +953,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
       r = 0;
     } else {
       ss << "incompat feature " << f << " not present in " << pending_mdsmap.compat;
-      r = -ENOENT;
+      r = 0;
     }
 
   } else if (prefix == "mds add_data_pool") {