From 99f8192cfc7588431673cadb71fad67ed21b9765 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 21 Mar 2016 17:00:22 -0400 Subject: [PATCH] os/bluestore: keep onode_map max_size Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 4 ++-- src/os/bluestore/BlueStore.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 9a18964dc65c9..5708174beb72d 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -641,7 +641,7 @@ BlueStore::Collection::Collection(BlueStore *ns, coll_t c) lock("BlueStore::Collection::lock", true, false), exists(true), enode_set(g_conf->bluestore_onode_map_size), - onode_map() + onode_map(g_conf->bluestore_onode_map_size) { } @@ -3838,7 +3838,7 @@ void BlueStore::_osr_reap_done(OpSequencer *osr) } if (txc->first_collection) { - txc->first_collection->onode_map.trim(g_conf->bluestore_onode_map_size); + txc->first_collection->onode_map.trim(); } osr->q.pop_front(); diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index edbd58b08b131..404c9579ed8fa 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -174,8 +174,9 @@ public: std::mutex lock; ceph::unordered_map onode_map; ///< forward lookups lru_list_t lru; ///< lru + size_t max_size; - OnodeHashLRU() {} + OnodeHashLRU(size_t s) : max_size(s) {} void add(const ghobject_t& oid, OnodeRef o); void _touch(OnodeRef o); -- 2.39.5