PGLog: on split, leave log head alone

This way last_update doesn't go backwards.

Fixes: 6447
Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 17a8070832475cb0574f3e1b4755f45dcd7680c9..1d9ed5f6a31a3ccd0ee20232167a557402113be2 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2406,9 +2406,8 @@ void PG::log_weirdness()
                        << " log bound mismatch, empty but (" << pg_log.get_tail() << ","
                        << pg_log.get_head() << "]\n";
   } else {
-    if ((pg_log.get_log().log.begin()->version <= pg_log.get_tail()) || // sloppy check
-       (pg_log.get_log().log.rbegin()->version != pg_log.get_head() &&
-        !(pg_log.get_head() == pg_log.get_tail())))
+    // sloppy check
+    if ((pg_log.get_log().log.begin()->version <= pg_log.get_tail()))
       osd->clog.error() << info.pgid
                        << " log bound mismatch, info (" << pg_log.get_tail() << ","
                        << pg_log.get_head() << "]"

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 6e025f289bc9999be6be95879b741fda0927d3e4..1949c96fd57d1350edf4690d2c0983b6ceb222d4 100644 (file)
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -52,13 +52,9 @@ void PGLog::IndexedLog::split_into(
 
   if (log.empty())
     tail = head;
-  else
-    head = log.rbegin()->version;
 
   if (olog->empty())
     olog->tail = olog->head;
-  else
-    olog->head = olog->log.rbegin()->version;
 
   olog->index();
   index();