]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/PGLog: skip ERROR entires in _merge_object_divergent_entries 16675/head
authorJeegn Chen <jeegnchen@gmail.com>
Sat, 29 Jul 2017 19:53:01 +0000 (03:53 +0800)
committerJeegn Chen <jeegnchen@gmail.com>
Thu, 3 Aug 2017 21:34:51 +0000 (05:34 +0800)
commit0eea622d920b6a8bee32e204c81ab267c7788a06
tree35a55d2ff328d1e943c2f4522e04749cd645a08f
parent05cec0a2134409c9947006e155e65c64878a3266
osd/PGLog: skip ERROR entires in _merge_object_divergent_entries

During consistency check, do not take the version of ERROR entries
as the valid prior version of the following non-error entry.

Fixes: http://tracker.ceph.com/issues/20843
Signed-off-by: Jeegn Chen <jeegnchen@gmail.com>
src/osd/PGLog.h
src/test/osd/TestPGLog.cc