From 7b242b56efec540efa21311cd2b654b895ce51db Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 17 Sep 2020 15:15:43 -0700 Subject: [PATCH] crimson/os/seastore: add journal_replay check and debugging Signed-off-by: Samuel Just --- src/crimson/os/seastore/journal.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc index f0be454976e1..ac910e58ad23 100644 --- a/src/crimson/os/seastore/journal.cc +++ b/src/crimson/os/seastore/journal.cc @@ -225,6 +225,10 @@ Journal::find_replay_segments_fut Journal::find_replay_segments() i); return find_replay_segments_ertr::now(); } + logger().debug( + "find_replay_segments: segment {} header {}", + i, + header); segments.emplace_back(i, std::move(header)); return find_replay_segments_ertr::now(); }).handle_error( @@ -271,6 +275,13 @@ Journal::find_replay_segments_fut Journal::find_replay_segments() [&replay_from](const auto &seg) -> bool { return seg.first == replay_from.segment; }); + if (from->second.journal_segment_seq != journal_tail.segment_seq) { + logger().error( + "find_replay_segments: journal_tail {} does not match {}", + journal_tail, + from->second); + assert(0 == "invalid"); + } } else { replay_from = paddr_t{from->first, (segment_off_t)block_size}; } -- 2.47.3