]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
BlueStore: drain wal_wq first if we exit from mounting due to wal_replay error 7242/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Mon, 18 Jan 2016 11:16:47 +0000 (19:16 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 18 Jan 2016 11:20:12 +0000 (19:20 +0800)
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>
src/os/bluestore/BlueStore.cc

index f83f16c7f446247b7f0c2bc383106489420c290b..3668d33f28b6f522fd4857f54aaa702242195e00 100644 (file)
@@ -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();