From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 18 Jan 2016 11:16:47 +0000 (+0800)
Subject: BlueStore: drain wal_wq first if we exit from mounting due to wal_replay error
X-Git-Tag: v10.0.4~195^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b4bd72f25c117ce4e22f966606550930cf5a2d96;p=ceph.git

BlueStore: drain wal_wq first if we exit from mounting due to wal_replay error

Because maybe we are in the middle of wal_replay and some wal transaction is already in process.

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index f83f16c7f4462..3668d33f28b6f 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1804,10 +1804,11 @@ int BlueStore::mount()
 
  out_stop:
   _kv_stop();
+  wal_wq.drain();
   wal_tp.stop();
   finisher.wait_for_empty();
   finisher.stop();
-out_coll:
+ out_coll:
   coll_map.clear();
  out_alloc:
   _close_alloc();