From: Samarah <samarah.uriarte@ibm.com>
Date: Thu, 9 Nov 2023 16:39:15 +0000 (+0000)
Subject: rgw/cache: this commit adds entries to redis driver and squashes the
X-Git-Tag: v20.0.0~2219^2~56
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9448e2a48490618c24960a8ee0a101863e02c997;p=ceph.git

rgw/cache: this commit adds entries to redis driver and squashes the
following two commits.

rgw: Update D4N policy and RedisDriver with entries
rgw/d4n: fixing compilation error in d4n policy code.

Signed-off-by: Samarah <samarah.uriarte@ibm.com>
Co-authored-by: Pritha Srivastava <prsrivas@redhat.com>
---

diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc
index cea91feb76ca2..ab1fbeca32c1f 100644
--- a/src/rgw/driver/d4n/rgw_sal_d4n.cc
+++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc
@@ -360,9 +360,8 @@ std::unique_ptr<Object::DeleteOp> D4NFilterObject::get_delete_op()
 int D4NFilterObject::D4NFilterReadOp::prepare(optional_yield y, const DoutPrefixProvider* dpp)
 {
   rgw::sal::Attrs attrs;
-  int getObjReturn = source->driver->get_cache_driver()->get_attrs(dpp, 
-		                                                         source->get_key().get_oid(), 
-					   				 attrs, y);
+  int getObjReturn = source->driver->get_cache_driver()->get_attrs(dpp, source->get_key().get_oid(), 
+								    attrs, y);
 
   next->params.mod_ptr = params.mod_ptr;
   next->params.unmod_ptr = params.unmod_ptr;
diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.h b/src/rgw/driver/d4n/rgw_sal_d4n.h
index c5961cfb078d4..1b8c893c2e794 100644
--- a/src/rgw/driver/d4n/rgw_sal_d4n.h
+++ b/src/rgw/driver/d4n/rgw_sal_d4n.h
@@ -22,6 +22,7 @@
 #include "common/dout.h" 
 #include "rgw_aio_throttle.h"
 
+#include "rgw_redis_driver.h"
 #include "driver/d4n/d4n_directory.h"
 #include "driver/d4n/d4n_policy.h"