From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Aug 2014 19:19:18 +0000 (-0700)
Subject: mon: flush before scrub
X-Git-Tag: v0.86~190^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3bb477c63d6ddf7a84772b82e66cb745d1c517e;p=ceph.git

mon: flush before scrub

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 571a8c0ee219..8d4f026b9b95 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2391,6 +2391,11 @@ void Monitor::handle_command(MMonCommand *m)
   }
 
   if (prefix == "scrub") {
+    while (paxos->is_writing()) {
+      lock.Unlock();
+      store->flush();
+      lock.Lock();
+    }
     if (is_leader()) {
       int r = scrub();
       reply_command(m, r, "", rdata, 0);