]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/PGLog: should not rollback further than deleted object version
authorNeha Ojha <nojha@redhat.com>
Wed, 6 Feb 2019 03:23:21 +0000 (19:23 -0800)
committerPrashant D <pdhange@redhat.com>
Mon, 29 Apr 2019 07:01:45 +0000 (03:01 -0400)
commit57718e510c453dd7121a8693bb4cf2913688534f
tree54096a88b8121131a8ba81c1ebeabdfc697b185e
parentb4537a491b0c6929f87a31e3eca96dccfd8fced7
osd/PGLog: should not rollback further than deleted object version

When a deleted object becomes a divergent entry in the pg log,
we should not be able to rollback to a version of the deleted
object that doesn't exist.

To avoid this, we need to preserve the original crt of the pg log,
before we update it in rewind_from_head() and use that to decide whether
we can rollback or not in _merge_object_divergent_entries().

Fixes: http://tracker.ceph.com/issues/36739
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit de18c592259816ad013ac82983cdec71bbfa51a0)

Conflicts:
src/osd/PGLog.h : Resolved for ceph_assert
src/osd/PGLog.cc
src/osd/PGLog.h
src/test/osd/TestPGLog.cc