From 2795eb123231dc0227bf76a47ae0bd8b48f3da5e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 19 Jul 2013 16:23:04 -0700 Subject: [PATCH] Revert "mon: OSDMonitor: only thrash and propose if we are the leader" This reverts commit 5eac38797d9eb5a59fcff1d81571cff7a2f10e66. --- src/mon/OSDMonitor.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 65443b2354adc..5c7573e4d604d 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -297,14 +297,8 @@ void OSDMonitor::on_active() send_to_waiting(); check_subs(); - if (thrash_map) { - if (is_leader()) { - if (thrash()) - propose_pending(); - } else { - thrash_map = 0; - } - } + if (thrash_map && thrash()) + propose_pending(); if (mon->is_leader()) mon->clog.info() << "osdmap " << osdmap << "\n"; -- 2.39.5