]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/PG: skip rollforward when !transaction_applied during append_log()
authorNeha Ojha <nojha@redhat.com>
Mon, 4 Mar 2019 04:29:05 +0000 (20:29 -0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 3 May 2019 09:27:13 +0000 (11:27 +0200)
commitb47712a16a47491209d2e6281abf76dd9cb26e4a
tree5f195ac9c95853e06d049c0592bb0a2ff64f9751
parent60da1c09710f9fdcbf35dba0b539ee57237fecc6
osd/PG: skip rollforward when !transaction_applied during append_log()

Earlier, we did pg_log.roll_forward(&handler), when
!transaction_applied, which advanced the crt and trimmed the entries
in rollforward(). Due to this, during _merge_object_divergent_entries(),
when we tried to rollback entries, those objects were not found in the
backend, and thus we hit this bug http://tracker.ceph.com/issues/36739.

With this change, we are advancing the crt value, without deleting the
objects, so that _merge_object_divergent_entries() does not fail
because of deleted objects.

Fixes: http://tracker.ceph.com/issues/36739
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 17419ee39342257f5a6f41c792e8e45a8e243720)
src/osd/PG.cc
src/osd/PGLog.h