diff options
author | Sage Weil <sage@inktank.com> | 2013-07-19 16:23:04 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-07-19 16:23:04 -0700 |
commit | 2795eb123231dc0227bf76a47ae0bd8b48f3da5e (patch) | |
tree | 0878d08a4055d1c88271c6b59eb059e89b35586d | |
parent | 0a9964934de1214088de866c763f2065e4cd5ff5 (diff) | |
download | ceph-2795eb123231dc0227bf76a47ae0bd8b48f3da5e.tar.gz |
Revert "mon: OSDMonitor: only thrash and propose if we are the leader"
This reverts commit 5eac38797d9eb5a59fcff1d81571cff7a2f10e66.
-rw-r--r-- | src/mon/OSDMonitor.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 65443b2354a..5c7573e4d60 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"; |