From: Sage Weil <sage@redhat.com>
Date: Fri, 16 Nov 2018 10:38:31 +0000 (-0600)
Subject: common/config: fix debug output for config callbacks changes
X-Git-Tag: v14.1.0~875^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c99c5f877f16568f498e65a093a25246b6a09613;p=ceph.git

common/config: fix debug output for config callbacks changes

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

diff --git a/src/common/config.cc b/src/common/config.cc
index ef9f6a16f3e..d9a69f94c2c 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -275,10 +275,11 @@ int md_config_t::set_mon_vals(CephContext *cct,
   }
 
   for (auto& i : kv) {
-    if (config_cb && config_cb(i.first, i.second)) {
-      ldout(cct, 4) << __func__ << " callback consumed " << i.first << dendl;
-      continue;
-    } else {
+    if (config_cb) {
+      if (config_cb(i.first, i.second)) {
+	ldout(cct, 4) << __func__ << " callback consumed " << i.first << dendl;
+	continue;
+      }
       ldout(cct, 4) << __func__ << " callback ignored " << i.first << dendl;
     }
     const Option *o = find_option(i.first);