From 4c9f7b32d184e52c1dd240c7602bd20702cbf5d8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 31 Jan 2018 17:18:21 -0600 Subject: [PATCH] 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 --- src/common/config.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/config.cc b/src/common/config.cc index 3227e2133de..0bb9ae37c64 100644 --- 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)); -- 2.39.5