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 1cd96ae99a2a3cccd509c5d1f8e5392de03dca7f..c7004fb088e69d15337c43d1f19802a4f0d32dbc 100644 (file)
--- 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);
     }