RGW: Update read workflow so attributes get written

Signed-off-by: Samarah Uriarte <samarah.uriarte@ibm.com>

diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc
index eca12726b8fed4d5fc35d2c7d6089400146a2518..7676bf93ac667716ccd7db17ad50c75e576fe51d 100644 (file)
--- a/src/rgw/driver/d4n/rgw_sal_d4n.cc
+++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc
@@ -714,14 +714,13 @@ int D4NFilterObject::D4NFilterReadOp::D4NFilterGetCB::handle_data(bufferlist& bl
   //Accumulating data from backend store into rgw_get_obj_max_req_size sized chunks and then writing to cache
   if (write_to_cache) {
     const std::lock_guard l(d3n_get_data.d3n_lock);
-    Attrs attrs;
 
     if (bl.length() > 0 && last_part) { // if bl = bl_rem has data and this is the last part, write it to cache
-      filter->get_cache_driver()->put(save_dpp, this->oid, bl, bl.length(), attrs); // need attrs for just chunk? -Sam
+      filter->get_cache_driver()->put(save_dpp, this->oid, bl, bl.length(), source->get_attrs()); 
     } else if (bl.length() == rgw_get_obj_max_req_size && bl_rem.length() == 0) { // if bl is the same size as rgw_get_obj_max_req_size, write it to cache
       ofs += bl_len;
 
-      filter->get_cache_driver()->put(save_dpp, this->oid, bl, bl.length(), attrs); // need attrs for just chunk? -Sam
+      filter->get_cache_driver()->put(save_dpp, this->oid, bl, bl.length(), source->get_attrs());
     } else { //copy data from incoming bl to bl_rem till it is rgw_get_obj_max_req_size, and then write it to cache
       uint64_t rem_space = rgw_get_obj_max_req_size - bl_rem.length();
       uint64_t len_to_copy = rem_space > bl.length() ? bl.length() : rem_space;
@@ -733,7 +732,7 @@ int D4NFilterObject::D4NFilterReadOp::D4NFilterGetCB::handle_data(bufferlist& bl
       if (bl_rem.length() == g_conf()->rgw_get_obj_max_req_size) {
         ofs += bl_rem.length();
 
-        filter->get_cache_driver()->put(save_dpp, this->oid, bl_rem, bl_rem.length(), attrs); // need attrs for just chunk? -Sam
+        filter->get_cache_driver()->put(save_dpp, this->oid, bl_rem, bl_rem.length(), source->get_attrs());
 
         bl_rem.clear();
         bl_rem = std::move(bl);
@@ -792,6 +791,7 @@ int D4NFilterWriter::prepare(optional_yield y)
 
 int D4NFilterWriter::process(bufferlist&& data, uint64_t offset)
 {
+  /*
   int append_dataReturn = driver->get_cache_driver()->append_data(save_dpp, obj->get_key().get_oid(), data);
 
   if (append_dataReturn < 0) {
@@ -799,7 +799,7 @@ int D4NFilterWriter::process(bufferlist&& data, uint64_t offset)
   } else {
     ldpp_dout(save_dpp, 20) << "D4N Filter: Cache append data operation succeeded." << dendl;
   }
-
+*/
   return next->process(std::move(data), offset);
 }
 
@@ -880,14 +880,14 @@ int D4NFilterWriter::complete(size_t accounted_size, const std::string& etag,
 
   baseAttrs.insert(attrs.begin(), attrs.end());
 
-  int set_attrsReturn = driver->get_cache_driver()->set_attrs(save_dpp, obj->get_key().get_oid(), baseAttrs);
+/*  int set_attrsReturn = driver->get_cache_driver()->set_attrs(save_dpp, obj->get_key().get_oid(), baseAttrs);
 
   if (set_attrsReturn < 0) {
     ldpp_dout(save_dpp, 20) << "D4N Filter: Cache set attributes operation failed." << dendl;
   } else {
     ldpp_dout(save_dpp, 20) << "D4N Filter: Cache set attributes operation succeeded." << dendl;
   }
-  
+  */
   return ret;
 }
 

diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.h b/src/rgw/driver/d4n/rgw_sal_d4n.h
index 352e0b76deae013ae39568db825db1ad0c529528..1a66d1a025dd32f4a3acb49f6f60b0036d7eacaf 100644 (file)
--- a/src/rgw/driver/d4n/rgw_sal_d4n.h
+++ b/src/rgw/driver/d4n/rgw_sal_d4n.h
@@ -113,6 +113,7 @@ class D4NFilterObject : public FilterObject {
          private:
            D4NFilterDriver* filter; // don't need -Sam ?
            std::string oid;
+           D4NFilterObject* source;
            RGWGetDataCB* client_cb;
            uint64_t ofs = 0, len = 0;
            bufferlist bl_rem;
@@ -121,8 +122,9 @@ class D4NFilterObject : public FilterObject {
            bool write_to_cache{true};
 
          public:
-           D4NFilterGetCB(D4NFilterDriver* _filter, std::string& _oid) : filter(_filter), 
-                                                                         oid(_oid) {}
+           D4NFilterGetCB(D4NFilterDriver* _filter, std::string& _oid, D4NFilterObject* _source) : filter(_filter), 
+                                                                         oid(_oid), 
+                                                                         source(_source) {}
 
            const DoutPrefixProvider* save_dpp;
 
@@ -139,7 +141,7 @@ class D4NFilterObject : public FilterObject {
                                                                                   source(_source) 
         {
          std::string oid = source->get_bucket()->get_marker() + "_" + source->get_key().get_oid();
-          cb = std::make_unique<D4NFilterGetCB>(source->driver, oid); 
+          cb = std::make_unique<D4NFilterGetCB>(source->driver, oid, source); 
        }
        virtual ~D4NFilterReadOp() = default;