config: Improve warning for unobserved value

When a variable is not being observed we currently mark it
"unchangable". This can be misleading so try something hopefully a
little more informative.

Fixes: http://tracker.ceph.com/issues/18424
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 914705055bdf782217a6b85aad493d1048f625d0..3bd4a9fb4e7ff1ce8554ef0fd59661c285496064 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -201,7 +201,7 @@ function test_mon_injectargs()
                  ceph tell osd.0 injectargs -- '--osd_op_history_duration'
 
   ceph tell osd.0 injectargs -- '--mon-lease 6' >& $TMPFILE || return 1
-  check_response "mon_lease = '6' (unchangeable)"
+  check_response "mon_lease = '6' (not observed, change may require restart)"
 
   # osd-scrub-auto-repair-num-errors is an OPT_U32, so -1 is not a valid setting
   expect_false ceph tell osd.0 injectargs --osd-scrub-auto-repair-num-errors -1

diff --git a/src/common/config.cc b/src/common/config.cc
index 45b00fca6881df8f9125e2e6e434a08ac1b5a1a3..34850dd2b4f7ea8799022fd94f7a648ac22b19bd 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -696,7 +696,7 @@ void md_config_t::_apply_changes(std::ostream *oss)
        !_internal_field(key)) {
       (*oss) << key << " = '" << buf << "' ";
       if (range.first == range.second) {
-       (*oss) << "(unchangeable) ";
+       (*oss) << "(not observed, change may require restart) ";
       }
     }
     for (obs_map_t::iterator r = range.first; r != range.second; ++r) {