From b422481e3bc184dad41a5feec1c0f3b54446a695 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 29 Jul 2022 14:23:19 +0800 Subject: [PATCH] crimson/os/seastore: unify segment info formatting Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/async_cleaner.cc | 29 +++++++++------- src/crimson/os/seastore/seastore_types.cc | 41 ++++++++++++----------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index 4c9d703ec2536..37f917c3f9c6e 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -76,15 +76,16 @@ void segment_info_t::init_closed( std::ostream& operator<<(std::ostream &out, const segment_info_t &info) { - out << "seg_info_t(" << info.id - << ", state=" << info.state; + out << "seg_info_t(" + << "state=" << info.state + << ", " << info.id; if (info.is_empty()) { // pass } else { // open or closed - out << ", seq=" << segment_seq_printer_t{info.seq} - << ", type=" << info.type - << ", category=" << info.category - << ", generation=" << reclaim_gen_printer_t{info.generation} + out << " " << info.type + << " " << segment_seq_printer_t{info.seq} + << " " << info.category + << " " << reclaim_gen_printer_t{info.generation} << ", modify_time=" << sea_time_point_printer_t{info.modify_time} << ", num_extents=" << info.num_extents << ", written_to=" << info.written_to; @@ -157,11 +158,11 @@ void segments_info_t::init_closed( { LOG_PREFIX(segments_info_t::init_closed); auto& segment_info = segments[segment]; - INFO("initiating {} {} {} {} {}, {}, " - "num_segments(empty={}, opened={}, closed={})", - segment, segment_seq_printer_t{seq}, type, - category, reclaim_gen_printer_t{generation}, - segment_info, num_empty, num_open, num_closed); + DEBUG("initiating {} {} {} {} {}, {}, " + "num_segments(empty={}, opened={}, closed={})", + segment, type, segment_seq_printer_t{seq}, + category, reclaim_gen_printer_t{generation}, + segment_info, num_empty, num_open, num_closed); ceph_assert(segment_info.is_empty()); ceph_assert(num_empty > 0); --num_empty; @@ -193,7 +194,7 @@ void segments_info_t::mark_open( auto& segment_info = segments[segment]; INFO("opening {} {} {} {} {}, {}, " "num_segments(empty={}, opened={}, closed={})", - segment, segment_seq_printer_t{seq}, type, + segment, type, segment_seq_printer_t{seq}, category, reclaim_gen_printer_t{generation}, segment_info, num_empty, num_open, num_closed); ceph_assert(segment_info.is_empty()); @@ -627,7 +628,9 @@ segment_id_t AsyncCleaner::allocate_segment( return seg_id; } } - ERROR("out of space with segment_seq={}", segment_seq_printer_t{seq}); + ERROR("out of space with {} {} {} {}", + type, segment_seq_printer_t{seq}, category, + reclaim_gen_printer_t{generation}); ceph_abort(); return NULL_SEG_ID; } diff --git a/src/crimson/os/seastore/seastore_types.cc b/src/crimson/os/seastore/seastore_types.cc index 6307f303061b9..7b5e4d15766ff 100644 --- a/src/crimson/os/seastore/seastore_types.cc +++ b/src/crimson/os/seastore/seastore_types.cc @@ -92,10 +92,10 @@ std::ostream& operator<<(std::ostream& out, segment_type_t t) std::ostream& operator<<(std::ostream& out, segment_seq_printer_t seq) { if (seq.seq == NULL_SEG_SEQ) { - return out << "NULL_SEG_SEQ"; + return out << "sseq(NULL)"; } else { assert(seq.seq <= MAX_VALID_SEG_SEQ); - return out << seq.seq; + return out << "sseq(" << seq.seq << ")"; } } @@ -137,9 +137,9 @@ std::ostream &operator<<(std::ostream &out, const journal_seq_t &seq) } else if (seq == JOURNAL_SEQ_MIN) { return out << "JOURNAL_SEQ_MIN"; } else { - return out << "journal_seq_t(" - << "segment_seq=" << segment_seq_printer_t{seq.segment_seq} - << ", offset=" << seq.offset + return out << "jseq(" + << segment_seq_printer_t{seq.segment_seq} + << ", " << seq.offset << ")"; } } @@ -273,26 +273,27 @@ std::ostream &operator<<(std::ostream &out, const extent_info_t &info) std::ostream &operator<<(std::ostream &out, const segment_header_t &header) { return out << "segment_header_t(" - << "segment_seq=" << segment_seq_printer_t{header.segment_seq} - << ", segment_id=" << header.physical_segment_id - << ", dirty_tail=" << header.dirty_tail - << ", alloc_tail=" << header.alloc_tail - << ", segment_nonce=" << header.segment_nonce - << ", type=" << header.type - << ", category=" << header.category - << ", generaton=" << (unsigned)header.generation - << ")"; + << header.physical_segment_id + << " " << header.type + << " " << segment_seq_printer_t{header.segment_seq} + << " " << header.category + << " " << reclaim_gen_printer_t{header.generation} + << ", dirty_tail=" << header.dirty_tail + << ", alloc_tail=" << header.alloc_tail + << ", segment_nonce=" << header.segment_nonce + << ")"; } std::ostream &operator<<(std::ostream &out, const segment_tail_t &tail) { return out << "segment_tail_t(" - << "segment_seq=" << tail.segment_seq - << ", segment_id=" << tail.physical_segment_id - << ", segment_nonce=" << tail.segment_nonce - << ", modify_time=" << mod_time_point_printer_t{tail.modify_time} - << ", num_extents=" << tail.num_extents - << ")"; + << tail.physical_segment_id + << " " << tail.type + << " " << segment_seq_printer_t{tail.segment_seq} + << ", segment_nonce=" << tail.segment_nonce + << ", modify_time=" << mod_time_point_printer_t{tail.modify_time} + << ", num_extents=" << tail.num_extents + << ")"; } extent_len_t record_size_t::get_raw_mdlength() const -- 2.39.5