rgw/restore: Update to neorados FIFO routines

Use new neorados/FIFO routines to store restore state.

Note: Old librados ioctx is also still retained as it is needed
by RestoreRadosSerializer.

Signed-off-by: Soumya Koduri <[email protected]>

Author: soumyakoduri

src/rgw/driver/rados/rgw_rados.cc

@@ -22,6 +22,7 @@
 #include "common/Throttle.h"
 #include "common/BackTrace.h"
 #include "common/ceph_time.h"
+#include "common/async/blocked_completion.h"
 
 #include "rgw_asio_thread.h"
 #include "rgw_cksum.h"
@@ -1150,7 +1151,6 @@ void RGWRados::finalize()
   if (use_restore_thread) {
     restore->stop_processor();
   }
-  delete restore;
   restore = NULL;
 }
 
@@ -1255,6 +1255,10 @@ int RGWRados::init_complete(const DoutPrefixProvider *dpp, optional_yield y, rgw
   if (ret < 0)
     return ret;
 
+  ret = open_restore_pool_neo_ctx(dpp);
+  if (ret < 0)
+    return ret;
+  
   ret = open_objexp_pool_ctx(dpp);
   if (ret < 0)
     return ret;
@@ -1378,7 +1382,7 @@ int RGWRados::init_complete(const DoutPrefixProvider *dpp, optional_yield y, rgw
   if (use_lc_thread)
     lc->start_processor();
 
-  restore = new RGWRestore();
+  restore = make_unique<rgw::restore::Restore>();
   ret = restore->initialize(cct, this->driver);
 
   if (ret < 0) {
@@ -1515,6 +1519,24 @@ int RGWRados::open_restore_pool_ctx(const DoutPrefixProvider *dpp)
   return rgw_init_ioctx(dpp, get_rados_handle(), svc.zone->get_zone_params().restore_pool, restore_pool_ctx, true, true);
 }
 
+int RGWRados::open_restore_pool_neo_ctx(const DoutPrefixProvider *dpp)
+{
+  maybe_warn_about_blocking(dpp);
+  try {
+    restore_pool_neo_ctx = rgw::init_iocontext(dpp, driver->get_neorados(),
+		                       svc.zone->get_zone_params().restore_pool,
+				       rgw::create, ceph::async::use_blocked);
+
+  } catch (const boost::system::system_error& e) {
+    ldpp_dout(dpp, -1) << __PRETTY_FUNCTION__ << ": Failed to initialized ioctx: "
+	   	       << e.what()
+	      	       << ", for restore pool" << dendl;
+    return ceph::from_error_code(e.code());
+  }
+  return 0;
+}
+
+
 int RGWRados::open_objexp_pool_ctx(const DoutPrefixProvider *dpp)
 {
   return rgw_init_ioctx(dpp, get_rados_handle(), svc.zone->get_zone_params().log_pool, objexp_pool_ctx, true, true);

src/rgw/driver/rados/rgw_rados.h

@@ -41,6 +41,7 @@
 #include "rgw_sal_fwd.h"
 #include "rgw_pubsub.h"
 #include "rgw_tools.h"
+#include "rgw_restore.h"
 
 struct D3nDataCache;
 struct RGWLCCloudTierCtx;
@@ -359,6 +360,7 @@ class RGWRados
   int open_gc_pool_ctx(const DoutPrefixProvider *dpp);
   int open_lc_pool_ctx(const DoutPrefixProvider *dpp);
   int open_restore_pool_ctx(const DoutPrefixProvider *dpp);
+  int open_restore_pool_neo_ctx(const DoutPrefixProvider *dpp);
   int open_objexp_pool_ctx(const DoutPrefixProvider *dpp);
   int open_reshard_pool_ctx(const DoutPrefixProvider *dpp);
   int open_notif_pool_ctx(const DoutPrefixProvider *dpp);
@@ -373,7 +375,7 @@ class RGWRados
   rgw::sal::RadosStore* driver{nullptr};
   RGWGC* gc{nullptr};
   RGWLC* lc{nullptr};
-  RGWRestore* restore{nullptr};
+  std::unique_ptr<rgw::restore::Restore> restore{nullptr};
   RGWObjectExpirer* obj_expirer{nullptr};
   bool use_gc_thread{false};
   bool use_lc_thread{false};
@@ -453,6 +455,7 @@ class RGWRados
   librados::IoCtx gc_pool_ctx;        // .rgw.gc
   librados::IoCtx lc_pool_ctx;        // .rgw.lc
   librados::IoCtx restore_pool_ctx;        // .rgw.restore
+  neorados::IOContext restore_pool_neo_ctx;        // .rgw.restore 
   librados::IoCtx objexp_pool_ctx;
   librados::IoCtx reshard_pool_ctx;
   librados::IoCtx notif_pool_ctx;     // .rgw.notif
@@ -504,8 +507,8 @@ class RGWRados
     return gc;
   }
 
-  RGWRestore *get_restore() {
-    return restore;
+  rgw::restore::Restore *get_restore() {
+    return restore.get();
   }
 
   RGWRados& set_run_gc_thread(bool _use_gc_thread) {
@@ -551,6 +554,10 @@ class RGWRados
     return &restore_pool_ctx;
   }
 
+  neorados::IOContext* get_restore_pool_neo_ctx() {
+    return &restore_pool_neo_ctx;
+  }
+  
   librados::IoCtx& get_notif_pool_ctx() {
     return notif_pool_ctx;
   }