]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/snaptrim_event: encode head oi with no oid
authorXuehan Xu <xxhdx1985126@gmail.com>
Thu, 27 Apr 2023 03:31:20 +0000 (03:31 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Sun, 21 May 2023 09:36:00 +0000 (09:36 +0000)
This is required by PGBackend::load_metadata

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit ba8732d2a942b4faede4bd3d88764f1da0aa5ad8)

src/crimson/osd/osd_operations/snaptrim_event.cc

index 4b71ca840a7e55e13daf028fd9870f104131449d..2c44e70c470a9aa895edb1fddcbe521dd370091e 100644 (file)
@@ -388,8 +388,8 @@ void SnapTrimObjSubEvent::update_head(
   attrs[SS_ATTR] = std::move(bl);
 
   bl.clear();
-  encode(head_obc->obs.oi, bl,
-         pg->get_osdmap()->get_features(CEPH_ENTITY_TYPE_OSD, nullptr));
+  head_obc->obs.oi.encode_no_oid(bl,
+    pg->get_osdmap()->get_features(CEPH_ENTITY_TYPE_OSD, nullptr));
   attrs[OI_ATTR] = std::move(bl);
   txn.setattrs(
     pg->get_collection_ref()->get_cid(),