From: Sage Weil <sage@redhat.com>
Date: Wed, 1 Oct 2014 00:19:35 +0000 (-0700)
Subject: mon: flush paxos write before setting shutdown state
X-Git-Tag: v0.87~40^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46c1d93653459ca5017998acec2d8746588bbd67;p=ceph.git

mon: flush paxos write before setting shutdown state

Paxos::commit_finish() makes assertions about our state (writing |
writing-previous).

Fixes: #9635
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 8f0b67a96b72b..81fc299989712 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -863,9 +863,9 @@ void Monitor::shutdown()
   dout(1) << "shutdown" << dendl;
 
   lock.Lock();
+  wait_for_paxos_write();
 
   state = STATE_SHUTDOWN;
-  wait_for_paxos_write();
 
   if (admin_hook) {
     AdminSocket* admin_socket = cct->get_admin_socket();