osd: do not advance past split point if it is not shared

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index e5fdb7ed1b13602dffb157d14626be51668c423d..01fd1b7dbccdc8397b022ecce668a04e86993948 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -350,7 +350,8 @@ void PG::merge_log(ObjectStore::Transaction& t,
          oldest_update = p->version;
        }
 
-       p++;       // move past the split point, tho...
+       if (p->version.version == log.top.version)
+         p++;       // move past the split point, if it also exists in our old log...
        break;
       }
     }