RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44490 from liu-chunmei/crimson-fix-aligned

Browse Source 
crimson: fix assert_aligned(size) in trim_data_reservation

reviewed by: Samuel Just <sjust@redhat.com> , Yingxin <yingxin.cheng@intel.com>
This commit is contained in:
Liu-Chunmei 2022-01-11 22:05:22 -08:00 committed by GitHub
commit 5fe65bc92b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crimson/os/seastore/object_data_handler.cc
View File

@ -308,12 +308,17 @@ ObjectDataHandler::clear_ret ObjectDataHandler::trim_data_reservation(
pin.get_laddr() <= object_data.get_reserved_data_base() + size);
auto pin_offset = pin.get_laddr() -
object_data.get_reserved_data_base();
if (pin.get_paddr().is_zero()) {
if ((pin.get_laddr() == (object_data.get_reserved_data_base() + size)) ||
(pin.get_paddr().is_zero())) {
/* First pin is exactly at the boundary or is a zero pin. Either way,
* remove all pins and add a single zero pin to the end. */
to_write.emplace_back(
pin.get_laddr(),
object_data.get_reserved_data_len() - pin_offset);
return clear_iertr::now();
} else {
/* First pin overlaps the boundary and has data, read in extent
* and rewrite portion prior to size */
return read_pin(
ctx,
pin.duplicate()
@ -548,6 +553,7 @@ ObjectDataHandler::truncate_ret ObjectDataHandler::truncate(
context_t ctx,
objaddr_t offset)
{
offset = p2roundup(offset, ctx.tm.get_block_size());
return with_object_data(
ctx,
[this, ctx, offset](auto &object_data) {