mon/ConfigMonitor: do not set NO_MON_UPDATE values

These options are special.  Since we can't get the values from the mon,
we also shouldn't store them there.  Most of them are not options that
can be changed anyway.

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

diff --git a/qa/workunits/mon/config.sh b/qa/workunits/mon/config.sh
index cef30d09c0628626cf7682d50b5dbcf8c0bf3b26..981927bd0a5480f5de1af7e1cb4702bcae1e1609 100755 (executable)
--- a/qa/workunits/mon/config.sh
+++ b/qa/workunits/mon/config.sh
@@ -93,12 +93,12 @@ do
 done
 ceph config show osd.0 | grep -c debug_asok | grep 0
 
-ceph config set osd.0 osd_data testorama
-while ! ceph config show osd.0 | grep osd_data | grep mon
+ceph config set osd.0 osd_scrub_cost 123
+while ! ceph config show osd.0 | grep osd_scrub_cost | grep mon
 do
     sleep 1
 done
-ceph config rm osd.0 osd_data
+ceph config rm osd.0 osd_scrub_cost
 
 # show-with-defaults
 ceph config show-with-defaults osd.0 | grep debug_asok

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index 96332c0059c25c013cf99862999a9f91b6bf007b..f22dac578d34317298d0cd61aca5e61185a63e50 100644 (file)
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -494,14 +494,18 @@ bool ConfigMonitor::prepare_command(MonOpRequestRef op)
        goto reply;
       }
 
-      if (opt) {
-       Option::value_t real_value;
-       string errstr;
-       err = opt->parse_value(value, &real_value, &errstr, &value);
-       if (err < 0) {
-         ss << "error parsing value: " << errstr;
-         goto reply;
-       }
+      Option::value_t real_value;
+      string errstr;
+      err = opt->parse_value(value, &real_value, &errstr, &value);
+      if (err < 0) {
+       ss << "error parsing value: " << errstr;
+       goto reply;
+      }
+
+      if (opt->has_flag(Option::FLAG_NO_MON_UPDATE)) {
+       err = -EINVAL;
+       ss << name << " is special and cannot be stored by the mon";
+       goto reply;
       }
     }