From: Sage Weil <sage@inktank.com>
Date: Fri, 19 Jul 2013 23:23:04 +0000 (-0700)
Subject: Revert "mon: OSDMonitor: only thrash and propose if we are the leader"
X-Git-Tag: v0.67-rc1~12^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2795eb123231dc0227bf76a47ae0bd8b48f3da5e;p=ceph.git

Revert "mon: OSDMonitor: only thrash and propose if we are the leader"

This reverts commit 5eac38797d9eb5a59fcff1d81571cff7a2f10e66.
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 65443b2354ad..5c7573e4d604 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";