]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: keep onode_map max_size
authorSage Weil <sage@redhat.com>
Mon, 21 Mar 2016 21:00:22 +0000 (17:00 -0400)
committerSage Weil <sage@redhat.com>
Wed, 30 Mar 2016 15:23:14 +0000 (11:23 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h

index 9a18964dc65c98124676c2c07b40c60e5ceb1777..5708174beb72d2eb81f72e948ea340a9ce123df4 100644 (file)
@@ -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();
index edbd58b08b13134f25179268f462e74cf6260257..404c9579ed8faf1f5d0cfb07d3f9dcc3a40fc149 100644 (file)
@@ -174,8 +174,9 @@ public:
     std::mutex lock;
     ceph::unordered_map<ghobject_t,OnodeRef> 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);