From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 2 Jun 2011 04:20:58 +0000 (-0700)
Subject: mon: make sure osd paxos is writeable before doing timeouts
X-Git-Tag: v0.29~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e2e4779e4323429167af36e9a5fb9741c075e96;p=ceph.git

mon: make sure osd paxos is writeable before doing timeouts

The osd paxos machine has to be writeable before we can update it.

Fixes: #1130
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 97defe56d69e..eabb2455a926 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -192,7 +192,8 @@ void PGMonitor::handle_osd_timeouts()
     return;
   }
 
-  mon->osdmon()->handle_osd_timeouts(now, last_osd_report);
+  if (mon->osdmon()->paxos->is_writeable())
+    mon->osdmon()->handle_osd_timeouts(now, last_osd_report);
 }
 
 void PGMonitor::create_pending()