osd,mds,common: make 'config rm ...' idempotent

Fixes: http://tracker.ceph.com/issues/24408
Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/workunits/mon/config.sh b/qa/workunits/mon/config.sh
index 547e4e291dc0290172bff9dc77db8f8d747779d0..d97106a4a141bf10fe05b8f2afc1b10b09149fe7 100755 (executable)
--- a/qa/workunits/mon/config.sh
+++ b/qa/workunits/mon/config.sh
@@ -74,6 +74,7 @@ do
 done
 ceph config show osd.0 | grep debug_xio | grep 'override mon'
 ceph tell osd.0 config unset debug_xio
+ceph tell osd.0 config unset debug_xio
 
 ceph config rm osd.0 debug_xio
 while ceph config show osd.0 | grep debug_xio | grep mon

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 80ee593dfeee82169344e3e134865b3f5ca236eb..faaca450b2d59175461313dc433e7f002d10bbb4 100644 (file)
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -441,7 +441,7 @@ void CephContext::do_command(std::string_view command, const cmdmap_t& cmdmap,
         f->dump_string("error", "syntax error: 'config unset <var>'");
       } else {
         int r = _conf->rm_val(var.c_str());
-        if (r < 0) {
+        if (r < 0 && r != -ENOENT) {
           f->dump_stream("error") << "error unsetting '" << var << "': "
                                  << cpp_strerror(r);
         } else {

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index 757959a4094c742f289ae5cf67590b5d6e24586b..0bc7cf68d911342cf1a35de714bc9f30e7f0dd98 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -794,6 +794,9 @@ int MDSDaemon::_handle_command(
     if (r == 0) {
       cct->_conf->apply_changes(nullptr);
     }
+    if (r == -ENOENT) {
+      r = 0; // idempotent
+    }
   } else if (prefix == "exit") {
     // We will send response before executing
     ss << "Exiting...";

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b23e88fa75389606cff8bc9a5076ad6a751df250..c251caa4396ef93673707ff899b0faad14a03837 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5828,6 +5828,9 @@ void OSD::do_command(Connection *con, ceph_tid_t tid, vector<string>& cmd, buffe
     if (r == 0) {
       cct->_conf->apply_changes(nullptr);
     }
+    if (r == -ENOENT) {
+      r = 0;  // make command idempotent
+    }
     osd_lock.Lock();
   }
   else if (prefix == "cluster_log") {