From: Sage Weil Date: Thu, 1 Jun 2017 02:43:17 +0000 (-0400) Subject: os/bluestore: rename cache mempools to bluestore_cache_* X-Git-Tag: ses5-milestone6~9^2~11^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf790b6a93012daafe2931008c19f3973b181cdc;p=ceph.git os/bluestore: rename cache mempools to bluestore_cache_* These map directly onto the bluestore_cache_size setting. Signed-off-by: Sage Weil --- diff --git a/src/include/mempool.h b/src/include/mempool.h index a79fc824f42..958e3344c47 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -138,10 +138,10 @@ namespace mempool { #define DEFINE_MEMORY_POOLS_HELPER(f) \ f(bloom_filter) \ f(bluestore_alloc) \ - f(bluestore_data) \ + f(bluestore_cache_data) \ + f(bluestore_cache_onode) \ + f(bluestore_cache_other) \ f(bluestore_fsck) \ - f(bluestore_meta_onode) \ - f(bluestore_meta_other) \ f(bluefs) \ f(buffer_anon) \ f(buffer_meta) \ diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 4dfa12a97c4..bec34bdf452 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -36,19 +36,19 @@ #define dout_context cct #define dout_subsys ceph_subsys_bluestore -// bluestore_meta_onode +// bluestore_cache_onode MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Onode, bluestore_onode, - bluestore_meta_onode); + bluestore_cache_onode); -// bluestore_meta_other +// bluestore_cache_other MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Buffer, bluestore_buffer, - bluestore_meta_other); + bluestore_cache_other); MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Extent, bluestore_extent, - bluestore_meta_other); + bluestore_cache_other); MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::Blob, bluestore_blob, - bluestore_meta_other); + bluestore_cache_other); MEMPOOL_DEFINE_OBJECT_FACTORY(BlueStore::SharedBlob, bluestore_shared_blob, - bluestore_meta_other); + bluestore_cache_other); // kv store prefixes const string PREFIX_SUPER = "S"; // field -> value @@ -1523,7 +1523,7 @@ void BlueStore::OnodeSpace::rename( OnodeRef& oldo, const ghobject_t& old_oid, const ghobject_t& new_oid, - const mempool::bluestore_meta_other::string& new_okey) + const mempool::bluestore_cache_other::string& new_okey) { std::lock_guard l(cache->lock); ldout(cache->cct, 30) << __func__ << " " << old_oid << " -> " << new_oid @@ -3109,7 +3109,7 @@ BlueStore::OnodeRef BlueStore::Collection::get_onode( if (o) return o; - mempool::bluestore_meta_other::string key; + mempool::bluestore_cache_other::string key; get_object_key(store->cct, oid, &key); ldout(store->cct, 20) << __func__ << " oid " << oid << " key " @@ -3258,9 +3258,9 @@ void *BlueStore::MempoolThread::entry() { Mutex::Locker l(lock); while (!stop) { - store->mempool_bytes = mempool::bluestore_meta_other::allocated_bytes() + - mempool::bluestore_meta_onode::allocated_bytes(); - store->mempool_onodes = mempool::bluestore_meta_onode::allocated_items(); + store->mempool_bytes = mempool::bluestore_cache_other::allocated_bytes() + + mempool::bluestore_cache_onode::allocated_bytes(); + store->mempool_onodes = mempool::bluestore_cache_onode::allocated_items(); ++store->mempool_seq; utime_t wait; wait += store->cct->_conf->bluestore_cache_trim_interval; @@ -6527,7 +6527,7 @@ int BlueStore::getattr( int r; { RWLock::RLocker l(c->lock); - mempool::bluestore_meta_other::string k(name); + mempool::bluestore_cache_other::string k(name); OnodeRef o = c->get_onode(oid, false); if (!o || !o->exists) { @@ -10677,7 +10677,7 @@ int BlueStore::_rename(TransContext *txc, << new_oid << dendl; int r; ghobject_t old_oid = oldo->oid; - mempool::bluestore_meta_other::string new_okey; + mempool::bluestore_cache_other::string new_okey; if (newo) { if (newo->exists) { diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index cc096450c7e..0b792f3bf6b 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -244,7 +244,7 @@ public: boost::intrusive::list_member_hook<>, &Buffer::state_item> > state_list_t; - mempool::bluestore_meta_other::map> + mempool::bluestore_cache_other::map> buffer_map; // we use a bare intrusive list here instead of std::map because @@ -265,7 +265,7 @@ public: } else { cache->_add_buffer(b, level, near); } - b->data.reassign_to_mempool(mempool::mempool_bluestore_data); + b->data.reassign_to_mempool(mempool::mempool_bluestore_cache_data); cache->_audit("_add_buffer end"); } void _rm_buffer(Cache* cache, Buffer *b) { @@ -410,7 +410,7 @@ public: // we use a bare pointer because we don't want to affect the ref // count - mempool::bluestore_meta_other::unordered_map sb_map; + mempool::bluestore_cache_other::unordered_map sb_map; SharedBlobRef lookup(uint64_t sbid) { std::lock_guard l(lock); @@ -615,7 +615,7 @@ public: #endif }; typedef boost::intrusive_ptr BlobRef; - typedef mempool::bluestore_meta_other::map blob_map_t; + typedef mempool::bluestore_cache_other::map blob_map_t; /// a logical extent, pointing to (some portion of) a blob typedef boost::intrusive::set_base_hook > ExtentBase; //making an alias to avoid build warnings @@ -720,7 +720,7 @@ public: bool loaded = false; ///< true if shard is loaded bool dirty = false; ///< true if shard is dirty and needs reencoding }; - mempool::bluestore_meta_other::vector shards; ///< shards + mempool::bluestore_cache_other::vector shards; ///< shards bufferlist inline_bl; ///< cached encoded map, if unsharded; empty=>dirty @@ -988,7 +988,7 @@ public: ghobject_t oid; /// key under PREFIX_OBJ where we are stored - mempool::bluestore_meta_other::string key; + mempool::bluestore_cache_other::string key; boost::intrusive::list_member_hook<> lru_item; @@ -1004,7 +1004,7 @@ public: std::condition_variable flush_cond; ///< wait here for uncommitted txns Onode(Collection *c, const ghobject_t& o, - const mempool::bluestore_meta_other::string& k) + const mempool::bluestore_cache_other::string& k) : nref(0), c(c), oid(o), @@ -1279,7 +1279,7 @@ public: Cache *cache; /// forward lookups - mempool::bluestore_meta_other::unordered_map onode_map; + mempool::bluestore_cache_other::unordered_map onode_map; friend class Collection; // for split_cache() @@ -1296,7 +1296,7 @@ public: } void rename(OnodeRef& o, const ghobject_t& old_oid, const ghobject_t& new_oid, - const mempool::bluestore_meta_other::string& new_okey); + const mempool::bluestore_cache_other::string& new_okey); void clear(); bool empty(); @@ -1794,7 +1794,7 @@ private: bool mounted = false; RWLock coll_lock = {"BlueStore::coll_lock"}; ///< rwlock to protect coll_map - mempool::bluestore_meta_other::unordered_map coll_map; + mempool::bluestore_cache_other::unordered_map coll_map; vector cache_shards; diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h index 6841ead46b0..27e76bef4f9 100644 --- a/src/os/bluestore/bluestore_types.h +++ b/src/os/bluestore/bluestore_types.h @@ -161,7 +161,7 @@ WRITE_CLASS_DENC(bluestore_pextent_t) ostream& operator<<(ostream& out, const bluestore_pextent_t& o); -typedef mempool::bluestore_meta_other::vector PExtentVector; +typedef mempool::bluestore_cache_other::vector PExtentVector; template<> struct denc_traits { @@ -209,7 +209,7 @@ struct bluestore_extent_ref_map_t { } }; - typedef mempool::bluestore_meta_other::map map_t; + typedef mempool::bluestore_cache_other::map map_t; map_t ref_map; void _check() const; @@ -940,7 +940,7 @@ ostream& operator<<(ostream& out, const bluestore_shared_blob_t& o); struct bluestore_onode_t { uint64_t nid = 0; ///< numeric id (locally unique) uint64_t size = 0; ///< object size - map attrs; ///< attrs + map attrs; ///< attrs struct shard_info { uint32_t offset = 0; ///< logical offset for start of shard diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index eabe7f1c026..a51da4ab2df 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -5744,11 +5744,11 @@ TEST_P(StoreTestSpecificAUSize, TooManyBlobsTest) { #if defined(HAVE_LIBAIO) void get_mempool_stats(uint64_t* total_bytes, uint64_t* total_items) { - uint64_t onode_allocated = mempool::bluestore_meta_onode::allocated_bytes(); - uint64_t other_allocated = mempool::bluestore_meta_other::allocated_bytes(); + uint64_t onode_allocated = mempool::bluestore_cache_onode::allocated_bytes(); + uint64_t other_allocated = mempool::bluestore_cache_other::allocated_bytes(); - uint64_t onode_items = mempool::bluestore_meta_onode::allocated_items(); - uint64_t other_items = mempool::bluestore_meta_other::allocated_items(); + uint64_t onode_items = mempool::bluestore_cache_onode::allocated_items(); + uint64_t other_items = mempool::bluestore_cache_other::allocated_items(); cout << "onode(" << onode_allocated << "/" << onode_items << ") other(" << other_allocated << "/" << other_items << ")" << std::endl;