From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Aug 2019 15:47:04 +0000 (-0500)
Subject: common/config: do no include multiple 'default' values
X-Git-Tag: v14.2.3~45^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dba8ff221ea68613028cbc3bdf5fa54e05995bc5;p=ceph.git

common/config: do no include multiple 'default' values

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 712409cac4a5d71718f21872a6982e529adc068b)
---

diff --git a/src/common/config.cc b/src/common/config.cc
index 1cd96ae99a2..c7004fb088e 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -1465,7 +1465,11 @@ void md_config_t::diff(
     }
     f->open_object_section(name.c_str());
     const Option *o = find_option(name);
-    dump(f, CONF_DEFAULT, _get_val_default(*o));
+    if (configs.size() &&
+	configs.begin()->first != CONF_DEFAULT) {
+      // show compiled-in default only if an override default wasn't provided
+      dump(f, CONF_DEFAULT, _get_val_default(*o));
+    }
     for (auto& j : configs) {
       dump(f, j.first, j.second);
     }