]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: make sure osd paxos is writeable before doing timeouts
authorSage Weil <sage.weil@dreamhost.com>
Thu, 2 Jun 2011 04:20:58 +0000 (21:20 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Thu, 2 Jun 2011 04:20:58 +0000 (21:20 -0700)
The osd paxos machine has to be writeable before we can update it.

Fixes: #1130
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/mon/PGMonitor.cc

index 97defe56d69ef6f0ba450432a1b28f815b24b5c4..eabb2455a926a66c34b64047d785eb1326a04eb9 100644 (file)
@@ -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()