]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: flush before scrub
authorSage Weil <sage@redhat.com>
Thu, 21 Aug 2014 19:19:18 +0000 (12:19 -0700)
committerSage Weil <sage@redhat.com>
Wed, 27 Aug 2014 21:36:08 +0000 (14:36 -0700)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/Monitor.cc

index 571a8c0ee219437c3f600e2fc5bed4062e45f812..8d4f026b9b9506cddc1f230a398b55baf577ee59 100644 (file)
@@ -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);