osdc/Journaler: derr log and abort when header update get (possibly) overwritten...

See: https://tracker.ceph.com/issues/58878#note-4

Signed-off-by: Venky Shankar <vshankar@redhat.com>

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 04b90fb5952aaf2b430fa0cd97fa0bbc4dd49192..c1c1178bd7f699b49c8432d796e5827d98031524 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -493,7 +493,21 @@ void Journaler::_finish_write_head(int r, Header &wrote,
   }
   ceph_assert(!readonly);
   ldout(cct, 10) << "_finish_write_head " << wrote << dendl;
-  last_committed = wrote;
+  if (wrote.write_pos < last_committed.write_pos ||
+      wrote.expire_pos < last_committed.expire_pos ||
+      wrote.trimmed_pos < last_committed.trimmed_pos) {
+    lderr(cct) << __func__ << ": not updating last_committed: "
+              << "(wrote.write_pos/last_committed.write_pos="
+              << wrote.write_pos << "," << last_committed.write_pos << "), "
+              << "(wrote.expire_pos/last_committed.expire_pos="
+              << wrote.expire_pos << "," << last_committed.expire_pos << "), "
+              << "(wrote.trimmed_pos/last_committed.trimmed_pos="
+              << wrote.trimmed_pos << "," << last_committed.trimmed_pos << ")"
+              << dendl;
+    ceph_abort();
+  } else {
+    last_committed = wrote;
+  }
   if (oncommit) {
     oncommit->complete(r);
   }