From 1b588e7c86228abe5e0af934b6f881d279909cab Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Mon, 24 Jan 2022 11:47:31 +0800 Subject: [PATCH] crimson/os/seastore: suppress verbose onode info logs Signed-off-by: Yingxin Cheng --- .../onode_manager/staged-fltree/node.cc | 34 +++++++++---------- .../onode_manager/staged-fltree/node_layout.h | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc index 0236a3c6bbe..f068bf2461e 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc @@ -599,10 +599,10 @@ Node::try_merge_adjacent( } else { update_index_after_merge = update_parent_index; } - INFOT("merge {} and {} at merge_stage={}, merge_size={}B, " - "update_index={}, is_left={} ...", - c.t, left_for_merge->get_name(), right_for_merge->get_name(), - merge_stage, merge_size, update_index_after_merge, is_left); + DEBUGT("merge {} and {} at merge_stage={}, merge_size={}B, " + "update_index={}, is_left={} ...", + c.t, left_for_merge->get_name(), right_for_merge->get_name(), + merge_stage, merge_size, update_index_after_merge, is_left); // we currently cannot generate delta depends on another extent content, // so use rebuild_extent() as a workaround to rebuild the node from a // fresh extent, thus no need to generate delta. @@ -907,10 +907,10 @@ eagain_ifuture<> InternalNode::erase_child(context_t c, Ref&& child_ref) (auto&& new_tail_child) mutable { auto child_pos = child_ref->parent_info().position; if (new_tail_child) { - INFOT("erase {}'s child {} at pos({}), " - "and fix new child tail {} at pos({}) ...", - c.t, get_name(), child_ref->get_name(), child_pos, - new_tail_child->get_name(), new_tail_child->parent_info().position); + DEBUGT("erase {}'s child {} at pos({}), " + "and fix new child tail {} at pos({}) ...", + c.t, get_name(), child_ref->get_name(), child_pos, + new_tail_child->get_name(), new_tail_child->parent_info().position); assert(!new_tail_child->impl->is_level_tail()); new_tail_child->make_tail(c); assert(new_tail_child->impl->is_level_tail()); @@ -919,8 +919,8 @@ eagain_ifuture<> InternalNode::erase_child(context_t c, Ref&& child_ref) new_tail_child.reset(); } } else { - INFOT("erase {}'s child {} at pos({}) ...", - c.t, get_name(), child_ref->get_name(), child_pos); + DEBUGT("erase {}'s child {} at pos({}) ...", + c.t, get_name(), child_ref->get_name(), child_pos); } Ref this_ref = child_ref->deref_parent(); @@ -1510,11 +1510,11 @@ eagain_ifuture> InternalNode::insert_or_split( outdated_child, c, FNAME](auto fresh_right) mutable { // I'm the left_node and need to split into the right_node auto right_node = fresh_right.node; - INFOT("proceed split {} to fresh {} with insert_child={}," - " outdated_child={} ...", - c.t, get_name(), right_node->get_name(), - insert_child->get_name(), - (outdated_child ? outdated_child->get_name() : "N/A")); + DEBUGT("proceed split {} to fresh {} with insert_child={}," + " outdated_child={} ...", + c.t, get_name(), right_node->get_name(), + insert_child->get_name(), + (outdated_child ? outdated_child->get_name() : "N/A")); auto insert_value = insert_child->impl->laddr(); auto [split_pos, is_insert_left, p_value] = impl->split_insert( fresh_right.mut, *right_node->impl, insert_key, insert_value, @@ -2089,8 +2089,8 @@ eagain_ifuture> LeafNode::insert_value( }).si_then([this_ref = std::move(this_ref), this, c, &key, vconf, FNAME, insert_pos, insert_stage=insert_stage, insert_size=insert_size](auto fresh_right) mutable { auto right_node = fresh_right.node; - INFOT("proceed split {} to fresh {} ...", - c.t, get_name(), right_node->get_name()); + DEBUGT("proceed split {} to fresh {} ...", + c.t, get_name(), right_node->get_name()); // no need to bump version for right node, as it is fresh on_layout_change(); impl->prepare_mutate(c); diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h index ffc668e2ccf..74cb57662c2 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h @@ -608,7 +608,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { assert(_right_impl.node_type() == NODE_TYPE); assert(_right_impl.field_type() == FIELD_TYPE); auto& right_impl = dynamic_cast(_right_impl); - SUBINFO(seastore_onode, + SUBDEBUG(seastore_onode, "begin at insert_pos({}), insert_stage={}, insert_size={}B ...", _insert_pos, insert_stage, insert_size); if (unlikely(LOGGER(seastore_onode).is_enabled(seastar::log_level::debug))) { @@ -798,7 +798,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { assert(p_value); auto split_pos = normalize(split_at.get_pos()); - SUBINFO(seastore_onode, + SUBDEBUG(seastore_onode, "done at insert_pos({}), insert_stage={}, insert_size={}B, " "split_at({}), is_insert_left={}, split_size={}B(target={}B)", _insert_pos, insert_stage, insert_size, split_pos, -- 2.39.5