]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
d4n/filter: Change from copying block to object in `copy_obj`
authorSamarah <samarah.uriarte@ibm.com>
Thu, 26 Oct 2023 17:49:02 +0000 (17:49 +0000)
committerPritha Srivastava <prsrivas@redhat.com>
Tue, 2 Apr 2024 15:54:51 +0000 (21:24 +0530)
Signed-off-by: Samarah <samarah.uriarte@ibm.com>
src/rgw/driver/d4n/rgw_sal_d4n.cc

index 8c8e7a8d92f1e8d6cb9ef0b03649ecf15cec89bc..d1ed8991c40f9c5bef5af499a2a01c7396b44bae 100644 (file)
@@ -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;