From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 4 Feb 2016 08:19:27 +0000 (+0800)
Subject: os/filestore/JournalingObjectStore: stop journal in a more graceful way
X-Git-Tag: v10.0.4~43^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be9c0efc286a34462826c90701e01c1261d24738;p=ceph.git

os/filestore/JournalingObjectStore: stop journal in a more graceful way

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/filestore/JournalingObjectStore.cc b/src/os/filestore/JournalingObjectStore.cc
index 4708d8a22e3c..100ae6610625 100644
--- a/src/os/filestore/JournalingObjectStore.cc
+++ b/src/os/filestore/JournalingObjectStore.cc
@@ -20,6 +20,7 @@ void JournalingObjectStore::journal_start()
 void JournalingObjectStore::journal_stop()
 {
   dout(10) << "journal_stop" << dendl;
+  finisher.wait_for_empty();
   finisher.stop();
 }