osd: rewind_divergent_log needs to dirty log if crt changes or ...

rollback_info_trimmed_to changes

PGLog::rewind_divergent_log was only causing the log to be marked
dirty and checkpointed if there were divergent entries. However
after a PG split it is possible that the log can be rewound
modifying crt and/or rollback_info_trimmed_to without creating
divergent entries because the entries being rolled back were
all split into the other PG.

Failing to checkpoint the log generates a window where if the OSD
is reset you can end up with crt (and rollback_info_trimmed_to) > head.
One consequence of this is asserts like
ceph_assert(rollback_info_trimmed_to == head); firing.

Fixes: https://tracker.ceph.com/issues/55141
Signed-off-by: Bill Scales <bill_scales@uk.ibm.com>

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 39b13beb4dc6e8717e5bcd8888b0f207a8bb54aa..d0c06cab72a4c1a5db2fcd7d8c601da8db9057eb 100644 (file)
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -349,10 +349,18 @@ void PGLog::rewind_divergent_log(eversion_t newhead,
   if (info.last_complete > newhead)
     info.last_complete = newhead;
 
-  auto divergent = log.rewind_from_head(newhead);
+  bool need_dirty_log;
+  auto divergent = log.rewind_from_head(newhead, &need_dirty_log);
   if (!divergent.empty()) {
     mark_dirty_from(divergent.front().version);
+  } else if (need_dirty_log) {
+    // can_rollback_to and/or rollback_info_trimmed_to have been modified
+    // and need checkpointing
+    dout(10) << "rewind_divergent_log crt = "
+            << log.get_can_rollback_to() << dendl;
+    dirty_log = true;
   }
+
   for (auto &&entry: divergent) {
     dout(10) << "rewind_divergent_log future divergent " << entry << dendl;
   }

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 8242a416abfba30a8d585033825a22dab8fac687..727786bf15e1527e369ca144d65a5c5ede4e66fb 100644 (file)
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -296,8 +296,8 @@ public:
                                        eversion_t previous_version) {});
     }
 
-    mempool::osd_pglog::list<pg_log_entry_t> rewind_from_head(eversion_t newhead) {
-      auto divergent = pg_log_t::rewind_from_head(newhead);
+    mempool::osd_pglog::list<pg_log_entry_t> rewind_from_head(eversion_t newhead, bool *dirty_log = nullptr) {
+      auto divergent = pg_log_t::rewind_from_head(newhead, dirty_log);
       index();
       reset_rollback_info_trimmed_to_riter();
       return divergent;

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index c6d29d1e6a659ddd96d7f242fc83e7fee130589d..0e116e06fabedfa2037bbfdecd1f7b447222996c 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4746,7 +4746,7 @@ public:
       std::move(childdups));
     }
 
-  mempool::osd_pglog::list<pg_log_entry_t> rewind_from_head(eversion_t newhead) {
+  mempool::osd_pglog::list<pg_log_entry_t> rewind_from_head(eversion_t newhead, bool *dirty_log = nullptr) {
     ceph_assert(newhead >= tail);
 
     mempool::osd_pglog::list<pg_log_entry_t>::iterator p = log.end();
@@ -4776,11 +4776,19 @@ public:
     }
     head = newhead;
 
-    if (can_rollback_to > newhead)
+    if (can_rollback_to > newhead) {
       can_rollback_to = newhead;
+      if (dirty_log) {
+       *dirty_log = true;
+      }
+    }
 
-    if (rollback_info_trimmed_to > newhead)
+    if (rollback_info_trimmed_to > newhead) {
       rollback_info_trimmed_to = newhead;
+      if (dirty_log) {
+       *dirty_log = true;
+      }
+    }
 
     return divergent;
   }