]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
BlueStore: fix shared_ptr leak during mount
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 6 Jan 2016 08:37:19 +0000 (16:37 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Thu, 14 Jan 2016 06:30:02 +0000 (14:30 +0800)
Fixes: #14261
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BlueStore.cc

index 6f871688747c3305d8a4915e155d9dba7936a8f6..97dbdf7831fde6b5112e8d599a4a08c17bf61615 100644 (file)
@@ -1749,7 +1749,7 @@ int BlueStore::mount()
   if (bluefs) {
     r = _reconcile_bluefs_freespace();
     if (r < 0)
-      goto out_alloc;
+      goto out_coll;
   }
 
   finisher.start();
@@ -1768,6 +1768,8 @@ int BlueStore::mount()
   wal_tp.stop();
   finisher.wait_for_empty();
   finisher.stop();
+out_coll:
+  coll_map.clear();
  out_alloc:
   _close_alloc();
  out_db: