From: Samuel Just <sjust@redhat.com>
Date: Thu, 17 Sep 2020 22:15:43 +0000 (-0700)
Subject: crimson/os/seastore: add journal_replay check and debugging
X-Git-Tag: v16.1.0~807^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b242b56efec540efa21311cd2b654b895ce51db;p=ceph.git

crimson/os/seastore: add journal_replay check and debugging

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc
index f0be454976e..ac910e58ad2 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};
 	  }