]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
PGLog::proc_replica_log: select divergent log entries correctly 1416/head
authorSamuel Just <sam.just@inktank.com>
Sat, 8 Mar 2014 00:51:36 +0000 (16:51 -0800)
committerSamuel Just <sam.just@inktank.com>
Sat, 8 Mar 2014 00:53:51 +0000 (16:53 -0800)
commit2591668158b4779c12c1316d2ea255268c63cfad
tree68f98bc595c97d521ef93128fb667b09237d18a2
parent3befb936c2ec5d1189b0f4b5a74b88c852e0a02d
PGLog::proc_replica_log: select divergent log entries correctly

Looking for an entry in olog which matches one of ours might add
extra divergent entries.  Instead, do what merge_log does and
walk back through the auth log looking for an entry in olog.

Fixes: 7657
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PGLog.cc