]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/PrimaryLogPG.cc: reassign size only when object size > truncate_size 24582/head
authorNeha Ojha <nojha@redhat.com>
Tue, 9 Oct 2018 22:57:15 +0000 (15:57 -0700)
committerNathan Cutler <ncutler@suse.com>
Mon, 15 Oct 2018 10:32:46 +0000 (12:32 +0200)
commitd41cd7540c11c039584d1df153b421ffb1dd0800
tree67c5c55a1ae729ba3ada11cc7d38f80cae341828
parent595016cd52826ce65c2fae9ee8b413d6c798ec86
osd/PrimaryLogPG.cc: reassign size only when object size > truncate_size

Before setting size equal to op.extent.truncate_size, we need to check
if the size of the object is greater than the truncate_size. We do not
need to set size to op.extent.truncate_size, in the case where the size of
the object is less than op.extent.truncate_size.

Without this change, we were always setting size =
op.extent.truncate_size, when (seq < op.extent.truncate_seq) and
(op.extent.offset + op.extent.length > op.extent.truncate_size), were both
true. This ended up in:

1. overestimating the size of the object
2. not considering the correct size of the object, for
   the later checks, which calculate op.extent.length for the read ops
3. causing crashes when trying to read more data than what was present

Fixes: http://tracker.ceph.com/issues/21931
Fixes: http://tracker.ceph.com/issues/22330
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 76c57810ee2346c392834206331aacb0faaa5b54)
src/osd/PrimaryLogPG.cc