From e57c1eeb4b870945b4c9ce3355d23dcd81263ed6 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Tue, 31 Aug 2021 12:39:45 +0800 Subject: [PATCH] crimson/os/seastore/lba_manager: fix logs Signed-off-by: Yingxin Cheng --- .../lba_manager/btree/btree_lba_manager.cc | 4 ++-- .../os/seastore/lba_manager/btree/lba_btree.cc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc index 6f3be5e1909f7..aa058a976e379 100644 --- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc +++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc @@ -95,7 +95,7 @@ BtreeLBAManager::get_mapping( laddr_t offset) { LOG_PREFIX(BtreeLBAManager::get_mapping); - DEBUGT(": {}", t, offset); + DEBUGT("{}", t, offset); auto c = get_context(t); return with_btree_ret( c, @@ -255,7 +255,7 @@ BtreeLBAManager::init_cached_extent_ret BtreeLBAManager::init_cached_extent( CachedExtentRef e) { LOG_PREFIX(BtreeLBAManager::init_cached_extent); - DEBUGT(": extent {}", t, *e); + DEBUGT("extent {}", t, *e); auto c = get_context(t); return with_btree( c, diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc index 3468c9121d0e6..41f09e45e8ccb 100644 --- a/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc +++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc @@ -253,7 +253,7 @@ LBABtree::init_cached_extent_ret LBABtree::init_cached_extent( CachedExtentRef e) { LOG_PREFIX(LBATree::init_cached_extent); - DEBUGT(": extent {}", c.trans, *e); + DEBUGT("extent {}", c.trans, *e); if (e->is_logical()) { auto logn = e->cast(); return lower_bound( @@ -267,10 +267,10 @@ LBABtree::init_cached_extent_ret LBABtree::init_cached_extent( ceph_assert(iter.get_val().len == e->get_length()); c.pins.add_pin( static_cast(logn->get_pin()).pin); - DEBUGT(": logical extent {} live, initialized", c.trans, *logn); + DEBUGT("logical extent {} live, initialized", c.trans, *logn); return e; } else { - DEBUGT(": logical extent {} not live, dropping", c.trans, *logn); + DEBUGT("logical extent {} not live, dropping", c.trans, *logn); c.cache.drop_from_cache(logn); return CachedExtentRef(); } @@ -284,10 +284,10 @@ LBABtree::init_cached_extent_ret LBABtree::init_cached_extent( depth_t cand_depth = eint->get_node_meta().depth; if (cand_depth <= iter.get_depth() && &*iter.get_internal(cand_depth).node == &*eint) { - DEBUGT(": extent {} is live", c.trans, *eint); + DEBUGT("extent {} is live", c.trans, *eint); return e; } else { - DEBUGT(": extent {} is not live", c.trans, *eint); + DEBUGT("extent {} is not live", c.trans, *eint); c.cache.drop_from_cache(eint); return CachedExtentRef(); } @@ -299,17 +299,17 @@ LBABtree::init_cached_extent_ret LBABtree::init_cached_extent( ).si_then([FNAME, c, e, eleaf](auto iter) { // Note, this check is valid even if iter.is_end() if (iter.leaf.node == &*eleaf) { - DEBUGT(": extent {} is live", c.trans, *eleaf); + DEBUGT("extent {} is live", c.trans, *eleaf); return e; } else { - DEBUGT(": extent {} is not live", c.trans, *eleaf); + DEBUGT("extent {} is not live", c.trans, *eleaf); c.cache.drop_from_cache(eleaf); return CachedExtentRef(); } }); } else { DEBUGT( - ": found other extent {} type {}", + "found other extent {} type {}", c.trans, *e, e->get_type()); -- 2.39.5