From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Aug 2019 15:53:06 +0000 (-0500)
Subject: common/config: let diff show non-build defaults
X-Git-Tag: v15.1.0~1929^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77b634ad08e9df9953a5f5c46c1da56d87fbc98e;p=ceph.git

common/config: let diff show non-build defaults

Notably, this includes things from set_val_default(), which may be set
at runtime.

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

diff --git a/src/common/config.cc b/src/common/config.cc
index 21072b995901..82d6a37efb20 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -1485,9 +1485,7 @@ void md_config_t::diff(
   string name) const
 {
   values.for_each([this, f, &values] (auto& name, auto& configs) {
-    if (configs.size() == 1 &&
-	configs.begin()->first == CONF_DEFAULT) {
-      // we only have a default value; exclude from diff
+    if (configs.empty()) {
       return;
     }
     f->open_object_section(std::string{name}.c_str());
diff --git a/src/test/common/test_context.cc b/src/test/common/test_context.cc
index 1d1e22e2558d..9aec89114455 100644
--- a/src/test/common/test_context.cc
+++ b/src/test/common/test_context.cc
@@ -56,7 +56,7 @@ TEST(CephContext, do_command)
     bufferlist out;
     cct->do_command("config diff get", cmdmap, "xml", &out);
     string s(out.c_str(), out.length());
-    EXPECT_EQ("<config_diff_get><diff><key><default></default><override>" + value + "</override><final>value</final></key></diff></config_diff_get>", s);
+    EXPECT_EQ("<config_diff_get><diff><key><default></default><override>" + value + "</override><final>value</final></key><rbd_default_features><default>61</default><final>61</final></rbd_default_features></diff></config_diff_get>", s);
   }
   cct->put();
 }