common/config: exclude unchanged defaults from diff

If we have a CONF_DEFAULT in the values map we do not need to include it
in the diff!

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

diff --git a/src/common/config.cc b/src/common/config.cc
index 3227e2133de9aef22f0e7386959e46928cf891c0..0bb9ae37c6467e00d05f94009ee7fdd0d6f5bfbc 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -1440,6 +1440,11 @@ void md_config_t::diff(
 {
   Mutex::Locker l(lock);
   for (auto& i : values) {
+    if (i.second.size() == 1 &&
+       i.second.begin()->first == CONF_DEFAULT) {
+      // we only have a default value; exclude from diff
+      continue;
+    }
     f->open_object_section(i.first.c_str());
     const Option *o = find_option(i.first);
     dump(f, CONF_DEFAULT, _get_val_default(*o));