From: kungf <yang.wang@easystack.cn>
Date: Thu, 10 Aug 2017 12:05:00 +0000 (+0800)
Subject: mon: return directly after health_events_cleanup
X-Git-Tag: v13.0.0~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=537f18cbc914d9e32dbf53d02558a1713a20b65f;p=ceph.git

mon: return directly after health_events_cleanup

when mon_health_to_clog was set false, all health events was cleanup,
no need to judge the change of mon_health_to_clog_interval and
mon_health_to_clog_tick_interval.

Signed-off-by: wang yang <yang.wang@easystack.cn>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
old mode 100644
new mode 100755
index b577b6f2db74..4e684de12ce4
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2359,6 +2359,7 @@ void Monitor::health_to_clog_update_conf(const std::set<std::string> &changed)
   if (changed.count("mon_health_to_clog")) {
     if (!cct->_conf->mon_health_to_clog) {
       health_events_cleanup();
+      return;
     } else {
       if (!health_tick_event) {
         health_tick_start();