From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Dec 2008 21:44:52 +0000 (-0800)
Subject: mon: immediately propose after 'osd setmap'
X-Git-Tag: v0.6~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b0337fddff910d5e4d69d9b814d7f17940c0f6d;p=ceph.git

mon: immediately propose after 'osd setmap'

Any subsequent osdmap changes will be ignored anyway.

Note that this still throws out changes _prior_ to the setmap.  In
theory, that shouldn't matter, since we're replacing the map
anyway.
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5771c4f71757..00251d361cdd 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -313,6 +313,10 @@ bool OSDMonitor::should_propose(double& delay)
 {
   dout(10) << "should_propose" << dendl;
 
+  // if full map, propose immediately!  any subsequent changes will be clobbered.
+  if (pending_inc.fullmap.length())
+    return true;
+
   // adjust osd weights?
   if (osd_weight.size() == (unsigned)osdmap.get_max_osd()) {
     dout(0) << " adjusting osd weights based on " << osd_weight << dendl;