osd: fix merge_log split point

Look at full eversion, not just .version (part 2).

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a115c03c73f335b0193bde4336e5ccc02bffc12b..3450c0dc482614e745ab608e2cba4ae46bb1cfd4 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -341,7 +341,7 @@ void PG::merge_log(ObjectStore::Transaction& t,
     list<Log::Entry>::iterator p = log.log.end();
     while (p != log.log.begin()) {
       p--;
-      if (p->version.version <= log.top.version) {
+      if (p->version <= log.top) {
        dout(10) << "merge_log split point is " << *p << dendl;
 
        if (p->version < log.top && p->version < oldest_update) {