From: Sage Weil <sage@newdream.net>
Date: Thu, 23 Apr 2009 23:41:09 +0000 (-0700)
Subject: osd: do not advance past split point if it is not shared
X-Git-Tag: v0.7.3~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8b552eeb4bef67a8ee3bdacb7e56e5c8d387754;p=ceph.git

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 e5fdb7ed1b13..01fd1b7dbccd 100644
--- 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;
       }
     }