Merge pull request ceph#62736 from adamemerson/wip-unbreak-d4n

rgw: Unbreak D4N

Reviewed-by: Pritha Srivastava <[email protected]>
Reviewed-by: Samarah Uriarte <[email protected]>

Author: cbodley

src/rgw/driver/d4n/rgw_sal_d4n.cc

@@ -36,36 +36,28 @@ static inline Object* nextObject(Object* t)
 D4NFilterDriver::D4NFilterDriver(Driver* _next, boost::asio::io_context& io_context) : FilterDriver(_next),
                                                                                        io_context(io_context) 
 {
-  conn = std::make_shared<connection>(boost::asio::make_strand(io_context));
-
   rgw::cache::Partition partition_info;
   partition_info.location = g_conf()->rgw_d4n_l1_datacache_persistent_path;
   partition_info.name = "d4n";
   partition_info.type = "read-cache";
   partition_info.size = g_conf()->rgw_d4n_l1_datacache_size;
-
-  cacheDriver = new rgw::cache::SSDDriver(partition_info);
-  objDir = new rgw::d4n::ObjectDirectory(conn);
-  blockDir = new rgw::d4n::BlockDirectory(conn);
-  policyDriver = new rgw::d4n::PolicyDriver(conn, cacheDriver, "lfuda");
+  cacheDriver = std::make_unique<rgw::cache::SSDDriver>(partition_info);
 }
 
-D4NFilterDriver::~D4NFilterDriver()
-{
-  // call cancel() on the connection's executor
-  boost::asio::dispatch(conn->get_executor(), [c = conn] { c->cancel(); });
-
-  delete cacheDriver;
-  delete objDir; 
-  delete blockDir; 
-  delete policyDriver;
-}
+D4NFilterDriver::~D4NFilterDriver() = default;
 
 int D4NFilterDriver::initialize(CephContext *cct, const DoutPrefixProvider *dpp)
 {
   namespace net = boost::asio;
   using boost::redis::config;
 
+  conn = std::make_shared<connection>(boost::asio::make_strand(io_context));
+  objDir = std::make_unique<rgw::d4n::ObjectDirectory>(conn);
+  blockDir = std::make_unique<rgw::d4n::BlockDirectory>(conn);
+  policyDriver = std::make_unique<rgw::d4n::PolicyDriver>(conn,
+							  cacheDriver.get(),
+							  "lfuda");
+
   std::string address = cct->_conf->rgw_d4n_address;
   config cfg;
   cfg.addr.host = address.substr(0, address.find(":"));
@@ -260,6 +252,19 @@ std::unique_ptr<Writer> D4NFilterDriver::get_atomic_writer(const DoutPrefixProvi
   return std::make_unique<D4NFilterWriter>(std::move(writer), this, obj, dpp, true, y);
 }
 
+void D4NFilterDriver::shutdown()
+{
+  // call cancel() on the connection's executor
+  boost::asio::dispatch(conn->get_executor(), [c = conn] { c->cancel(); });
+
+  cacheDriver.reset();
+  objDir.reset();
+  blockDir.reset();
+  policyDriver.reset();
+
+  next->shutdown();
+}
+
 std::unique_ptr<Object::ReadOp> D4NFilterObject::get_read_op()
 {
   std::unique_ptr<ReadOp> r = next->get_read_op();

src/rgw/driver/d4n/rgw_sal_d4n.h

@@ -42,10 +42,10 @@ using boost::redis::connection;
 class D4NFilterDriver : public FilterDriver {
   private:
     std::shared_ptr<connection> conn;
-    rgw::cache::CacheDriver* cacheDriver;
-    rgw::d4n::ObjectDirectory* objDir;
-    rgw::d4n::BlockDirectory* blockDir;
-    rgw::d4n::PolicyDriver* policyDriver;
+    std::unique_ptr<rgw::cache::CacheDriver> cacheDriver;
+    std::unique_ptr<rgw::d4n::ObjectDirectory> objDir;
+    std::unique_ptr<rgw::d4n::BlockDirectory> blockDir;
+    std::unique_ptr<rgw::d4n::PolicyDriver> policyDriver;
     boost::asio::io_context& io_context;
 
   public:
@@ -64,10 +64,13 @@ class D4NFilterDriver : public FilterDriver {
 				  const rgw_placement_rule *ptail_placement_rule,
 				  uint64_t olh_epoch,
 				  const std::string& unique_tag) override;
-    rgw::cache::CacheDriver* get_cache_driver() { return cacheDriver; }
-    rgw::d4n::ObjectDirectory* get_obj_dir() { return objDir; }
-    rgw::d4n::BlockDirectory* get_block_dir() { return blockDir; }
-    rgw::d4n::PolicyDriver* get_policy_driver() { return policyDriver; }
+    rgw::cache::CacheDriver* get_cache_driver() { return cacheDriver.get(); }
+
+
+    rgw::d4n::ObjectDirectory* get_obj_dir() { return objDir.get(); }
+    rgw::d4n::BlockDirectory* get_block_dir() { return blockDir.get(); }
+    rgw::d4n::PolicyDriver* get_policy_driver() { return policyDriver.get(); }
+    void shutdown() override;
 };
 
 class D4NFilterUser : public FilterUser {

src/rgw/rgw_sal_filter.h

@@ -488,6 +488,8 @@ class FilterDriver : public Driver {
   virtual const std::string& get_compression_type(const rgw_placement_rule& rule) override;
   virtual bool valid_placement(const rgw_placement_rule& rule) override;
 
+  virtual void shutdown(void) override { next->shutdown(); };
+
   virtual void finalize(void) override;
 
   virtual CephContext* ctx(void) override;