]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: flush paxos write before setting shutdown state
authorSage Weil <sage@redhat.com>
Wed, 1 Oct 2014 00:19:35 +0000 (17:19 -0700)
committerSage Weil <sage@redhat.com>
Wed, 1 Oct 2014 00:19:35 +0000 (17:19 -0700)
Paxos::commit_finish() makes assertions about our state (writing |
writing-previous).

Fixes: #9635
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/Monitor.cc

index 8f0b67a96b72bd31ff552f8f659de49acef2d279..81fc2999897128cd0357b683908ffe558aa4ecc3 100644 (file)
@@ -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();