From: Sage Weil <sage@newdream.net>
Date: Fri, 18 Nov 2011 17:43:09 +0000 (-0800)
Subject: Revert "mon: don't propose new state from update_from_paxos"
X-Git-Tag: v0.39~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa5876870a2d5d0d514533e43359a77c8e115e6b;p=ceph-ci.git

Revert "mon: don't propose new state from update_from_paxos"

This reverts commit 66c628acc8be71a92e801179431e4b938b857b3d.
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index b12d08e65f8..1a21a291a04 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -95,7 +95,6 @@ void PGMonitor::on_active()
   if (mon->is_leader()) {
     check_osd_map(mon->osdmon()->osdmap.epoch);
   }
-  send_pg_creates();
 }
 
 void PGMonitor::tick() 
@@ -184,6 +183,8 @@ bool PGMonitor::update_from_paxos()
       paxosv > max)
     paxos->trim_to(paxosv - max);
 
+  send_pg_creates();
+
   return true;
 }
 
@@ -565,6 +566,8 @@ void PGMonitor::check_osd_map(epoch_t epoch)
   
   if (propose)
     propose_pending();
+
+  send_pg_creates();
 }
 
 void PGMonitor::register_pg(pg_pool_t& pool, pg_t pgid, epoch_t epoch, bool new_pool)