]> git.apps.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)
committerNeha Ojha <nojha@redhat.com>
Wed, 17 Apr 2019 17:13:21 +0000 (10:13 -0700)
commit962969c74923765d1b9173c97fc4bfcc91f83df2
tree9a820b85776665ee117684354db5206bebd24274
parentd33c5479053916803afd708eeb27238e3fc2d0ec
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