From: chunmei-liu <chunmei.liu@intel.com>
Date: Tue, 25 Jan 2022 06:39:31 +0000 (-0800)
Subject: crimson: fix qa/RadosModel content corrupt
X-Git-Tag: v18.0.0~1495^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a59057a6bd3ce3171de04572b8cbbfb8fa74895e;p=ceph.git

crimson: fix qa/RadosModel content corrupt

RadosModel test read more length than object size, if truncate
not append zero to bufferlist, RadosMode will read more data and
it will check if there is content after the object size. So append
zero after truncate size to end of extent.

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>
---

diff --git a/src/crimson/os/seastore/object_data_handler.cc b/src/crimson/os/seastore/object_data_handler.cc
index 583e6118768..4e5a55b0d0a 100644
--- a/src/crimson/os/seastore/object_data_handler.cc
+++ b/src/crimson/os/seastore/object_data_handler.cc
@@ -284,7 +284,6 @@ ObjectDataHandler::clear_ret ObjectDataHandler::trim_data_reservation(
   context_t ctx, object_data_t &object_data, extent_len_t size)
 {
   ceph_assert(!object_data.is_null());
-  assert_aligned(size);
   ceph_assert(size <= object_data.get_reserved_data_len());
   return seastar::do_with(
     lba_pin_list_t(),
@@ -322,7 +321,7 @@ ObjectDataHandler::clear_ret ObjectDataHandler::trim_data_reservation(
 	  return read_pin(
 	    ctx,
 	    pin.duplicate()
-	  ).si_then([size, pin_offset, &pin, &object_data, &to_write](
+	  ).si_then([ctx, size, pin_offset, &pin, &object_data, &to_write](
 		     auto extent) {
 	    bufferlist bl;
 	    bl.append(
@@ -331,12 +330,15 @@ ObjectDataHandler::clear_ret ObjectDataHandler::trim_data_reservation(
 		0,
 		size - pin_offset
 	      ));
+	    bl.append_zero(p2roundup(size, ctx.tm.get_block_size()) - size);
 	    to_write.emplace_back(
 	      pin.get_laddr(),
 	      bl);
 	    to_write.emplace_back(
-	      object_data.get_reserved_data_base() + size,
-	      object_data.get_reserved_data_len() - size);
+	      object_data.get_reserved_data_base() +
+                p2roundup(size, ctx.tm.get_block_size()),
+	      object_data.get_reserved_data_len() -
+                p2roundup(size, ctx.tm.get_block_size()));
 	    return clear_iertr::now();
 	  });
 	}
@@ -553,7 +555,6 @@ 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) {
@@ -569,7 +570,7 @@ ObjectDataHandler::truncate_ret ObjectDataHandler::truncate(
 	return prepare_data_reservation(
 	  ctx,
 	  object_data,
-	  offset);
+	  p2roundup(offset, ctx.tm.get_block_size()));
       } else {
 	return truncate_iertr::now();
       }