From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 6 Jan 2016 08:37:19 +0000 (+0800)
Subject: BlueStore: fix shared_ptr leak during mount
X-Git-Tag: v10.0.3~42^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0747e3bdec6140c0359cf0e470891f27b487fddf;p=ceph.git

BlueStore: fix shared_ptr leak during mount

Fixes: #14261
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 6f871688747c..97dbdf7831fd 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -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: