From 7a4ab9221455b8f467817fed420d229b62e34d31 Mon Sep 17 00:00:00 2001 From: Samarah Date: Thu, 26 Oct 2023 17:49:02 +0000 Subject: [PATCH] d4n/filter: Change from copying block to object in `copy_obj` Signed-off-by: Samarah --- src/rgw/driver/d4n/rgw_sal_d4n.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc index 8c8e7a8d92f1e..d1ed8991c40f9 100644 --- a/src/rgw/driver/d4n/rgw_sal_d4n.cc +++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc @@ -122,14 +122,11 @@ int D4NFilterObject::copy_object(User* user, const DoutPrefixProvider* dpp, optional_yield y) { - rgw::d4n::CacheBlock block = rgw::d4n::CacheBlock{ - .cacheObj = { - .objName = this->get_key().get_oid(), - .bucketName = src_bucket->get_name() - }, - .blockID = 0, // TODO: get correct blockID + rgw::d4n::CacheObj obj = rgw::d4n::CacheObj{ + .objName = this->get_key().get_oid(), + .bucketName = src_bucket->get_name() }; - int copy_valueReturn = driver->get_block_dir()->copy(&block, dest_object->get_name(), dest_bucket->get_name(), y); + int copy_valueReturn = driver->get_obj_dir()->copy(&obj, dest_object->get_name(), dest_bucket->get_name(), y); if (copy_valueReturn < 0) { ldpp_dout(dpp, 20) << "D4N Filter: Block directory copy operation failed." << dendl; -- 2.39.5