From fcaeb67de726de24ebba68587298913dcd84d224 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 22 Sep 2016 15:16:03 +0800 Subject: [PATCH] os/bluestore: clean up finishers properly Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index adc6e843d8cf..61b85ab160f7 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -2110,7 +2110,7 @@ BlueStore::OnodeRef BlueStore::Collection::get_onode( on = new Onode(&onode_map, this, oid, key); } else { // loaded - assert(r >=0 ); + assert(r >= 0); on = new Onode(&onode_map, this, oid, key); on->exists = true; bufferlist::iterator p = v.begin(); @@ -2202,8 +2202,8 @@ BlueStore::~BlueStore() { for (auto f : finishers) { delete f; - f = NULL; } + finishers.clear(); g_ceph_context->_conf->remove_observer(this); _shutdown_logger(); -- 2.47.3