Merge pull request #16964 from kungf/mon_timer

mon: return directly after health_events_cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-08-11 08:30:42 -05:00 committed by GitHub
commit 02118ffa85

1
src/mon/Monitor.cc Normal file → Executable file
View File

@ -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();