From: Marcus Watts Date: Tue, 25 Feb 2025 22:00:06 +0000 (-0500) Subject: copy object encryption fixes - fixups X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8104e150ddcc85b626bd54bcad7750af4fc7d7e0;p=ceph-ci.git copy object encryption fixes - fixups minor fixup on byte ranges. other updates to match ceph main. Fixes: https://tracker.ceph.com/issues/23264 Signed-off-by: Marcus Watts (cherry picked from commit 2292920e188987f37b848cfa1789c02d31173b39) --- diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc index 257803c6d3c..4c35fff3d13 100644 --- a/src/rgw/driver/d4n/rgw_sal_d4n.cc +++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc @@ -637,6 +637,7 @@ int D4NFilterObject::copy_object(const ACLOwner& owner, std::string* etag, void (*progress_cb)(off_t, void *), void* progress_data, + rgw::sal::ObjectFilter *read_filter, const DoutPrefixProvider* dpp, optional_yield y) { @@ -668,7 +669,7 @@ int D4NFilterObject::copy_object(const ACLOwner& owner, mod_ptr, unmod_ptr, high_precision_time, if_match, if_nomatch, attrs_mod, copy_if_newer, attrs, category, olh_epoch, delete_at, version_id, tag, - etag, progress_cb, progress_data, dpp, y); + etag, progress_cb, progress_data, read_filter, dpp, y); if (ret < 0) { ldpp_dout(dpp, 10) << "D4NFilterObject::" << __func__ << "(): next->copy_object failed with ret: " << ret << dendl; return ret; diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.h b/src/rgw/driver/d4n/rgw_sal_d4n.h index f844dc73d5f..441ade1c17f 100644 --- a/src/rgw/driver/d4n/rgw_sal_d4n.h +++ b/src/rgw/driver/d4n/rgw_sal_d4n.h @@ -243,6 +243,7 @@ class D4NFilterObject : public FilterObject { std::string* etag, void (*progress_cb)(off_t, void *), void* progress_data, + rgw::sal::ObjectFilter *read_filter, const DoutPrefixProvider* dpp, optional_yield y) override; diff --git a/src/test/rgw/test_d4n_filter.cc b/src/test/rgw/test_d4n_filter.cc index c2d3c378c1a..cc33e306361 100755 --- a/src/test/rgw/test_d4n_filter.cc +++ b/src/test/rgw/test_d4n_filter.cc @@ -464,6 +464,7 @@ TEST_F(D4NFilterFixture, CopyNoneObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -574,6 +575,7 @@ TEST_F(D4NFilterFixture, CopyMergeObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -660,6 +662,7 @@ TEST_F(D4NFilterFixture, CopyReplaceObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -944,6 +947,7 @@ TEST_F(D4NFilterFixture, CopyNoneVersionedObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -998,6 +1002,7 @@ TEST_F(D4NFilterFixture, CopyNoneVersionedObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1082,6 +1087,7 @@ TEST_F(D4NFilterFixture, CopyMergeVersionedObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1136,6 +1142,7 @@ TEST_F(D4NFilterFixture, CopyMergeVersionedObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1220,6 +1227,7 @@ TEST_F(D4NFilterFixture, CopyReplaceVersionedObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1274,6 +1282,7 @@ TEST_F(D4NFilterFixture, CopyReplaceVersionedObjectRead) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1636,6 +1645,7 @@ TEST_F(D4NFilterFixture, CopyNoneObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1757,6 +1767,7 @@ TEST_F(D4NFilterFixture, CopyMergeObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -1878,6 +1889,7 @@ TEST_F(D4NFilterFixture, CopyReplaceObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -2389,6 +2401,7 @@ TEST_F(D4NFilterFixture, CopyNoneVersionedObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -2481,6 +2494,7 @@ TEST_F(D4NFilterFixture, CopyNoneVersionedObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -2609,6 +2623,7 @@ TEST_F(D4NFilterFixture, CopyMergeVersionedObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -2701,6 +2716,7 @@ TEST_F(D4NFilterFixture, CopyMergeVersionedObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -2829,6 +2845,7 @@ TEST_F(D4NFilterFixture, CopyReplaceVersionedObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); @@ -2921,6 +2938,7 @@ TEST_F(D4NFilterFixture, CopyReplaceVersionedObjectWrite) &tag, nullptr, nullptr, + nullptr, env->dpp, optional_yield({yield})); EXPECT_EQ(ret, 0); diff --git a/src/test/rgw/test_rgw_posix_driver.cc b/src/test/rgw/test_rgw_posix_driver.cc index a8b0f9bb348..caac0b1b022 100644 --- a/src/test/rgw/test_rgw_posix_driver.cc +++ b/src/test/rgw/test_rgw_posix_driver.cc @@ -1541,6 +1541,7 @@ TEST_F(POSIXObjectTest, ObjectCopy) &tag, nullptr, nullptr, + nullptr, env->dpp, null_yield); EXPECT_EQ(ret, 0); @@ -1849,6 +1850,7 @@ TEST_F(POSIXMPObjectTest, MPUploadCopy) &tag, nullptr, nullptr, + nullptr, env->dpp, null_yield); EXPECT_EQ(ret, 0); @@ -2298,6 +2300,7 @@ TEST_F(POSIXVerObjectTest, ObjectCopy) &tag, nullptr, nullptr, + nullptr, env->dpp, null_yield); EXPECT_EQ(ret, 0); @@ -2375,6 +2378,7 @@ TEST_F(POSIXVerObjectTest, CopyVersion) &tag, nullptr, nullptr, + nullptr, env->dpp, null_yield); EXPECT_EQ(ret, 0);