Question about PG::merge_log

Commit Message

Henry Chang March 10, 2011, 9:19 a.m. UTC

None

Patch

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 2778591..671a37d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -351,7 +351,8 @@  void PG::merge_log(ObjectStore::Transaction& t,
       if (p->version <= log.head) {
        dout(10) << "merge_log split point is " << *p << dendl;

-       if (p->version == log.head)
+       if (old_objects.find(p->soid) != old_objects.end() &&
+           old_objects[p->soid]->version == p->version)
          p++;       // move past the split point, if it also exists
in our old log...
        break;