osd: fix merge_log when split point is divergent

Need to compare full eversion (including epoch).

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