rgw/service: remove unused metadata and metadata backend services

Signed-off-by: Casey Bodley <[email protected]>

Author: cbodley

src/rgw/CMakeLists.txt

@@ -40,9 +40,6 @@ set(librgw_common_srcs
   services/svc_cls.cc
   services/svc_config_key_rados.cc
   services/svc_mdlog.cc
-  services/svc_meta.cc
-  services/svc_meta_be.cc
-  services/svc_meta_be_sobj.cc
   services/svc_notify.cc
   services/svc_quota.cc
   services/svc_sync_modules.cc

src/rgw/driver/rados/rgw_bucket.cc

@@ -3099,7 +3099,6 @@ int RGWBucketCtl::read_bucket_info(const rgw_bucket& bucket,
     ep.emplace();
 
     int r = read_bucket_entrypoint_info(*b, &(*ep), y, dpp, RGWBucketCtl::Bucket::GetParams()
-                                                    .set_bectx_params(params.bectx_params)
                                                     .set_objv_tracker(ep_objv_tracker));
     if (r < 0) {
       return r;

src/rgw/driver/rados/rgw_bucket.h

@@ -31,7 +31,6 @@
 // define as static when RGWBucket implementation completes
 extern void rgw_get_buckets_obj(const rgw_user& user_id, std::string& buckets_obj_id);
 
-class RGWSI_Meta;
 class RGWBucketMetadataHandler;
 class RGWBucketInstanceMetadataHandler;
 class RGWUserCtl;
@@ -449,7 +448,6 @@ class RGWBucketCtl {
       std::map<std::string, bufferlist> *attrs{nullptr};
       rgw_cache_entry_info *cache_info{nullptr};
       boost::optional<obj_version> refresh_version;
-      std::optional<RGWSI_MetaBackend_CtxParams> bectx_params;
 
       GetParams() {}
 
@@ -477,11 +475,6 @@ class RGWBucketCtl {
         refresh_version = _refresh_version;
         return *this;
       }
-
-      GetParams& set_bectx_params(std::optional<RGWSI_MetaBackend_CtxParams> _bectx_params) {
-        bectx_params = _bectx_params;
-        return *this;
-      }
     };
 
     struct PutParams {
@@ -532,7 +525,6 @@ class RGWBucketCtl {
       rgw_cache_entry_info *cache_info{nullptr};
       boost::optional<obj_version> refresh_version;
       RGWObjVersionTracker *objv_tracker{nullptr};
-      std::optional<RGWSI_MetaBackend_CtxParams> bectx_params;
 
       GetParams() {}
 
@@ -560,11 +552,6 @@ class RGWBucketCtl {
         objv_tracker = _objv_tracker;
         return *this;
       }
-
-      GetParams& set_bectx_params(std::optional<RGWSI_MetaBackend_CtxParams> _bectx_params) {
-        bectx_params = _bectx_params;
-        return *this;
-      }
     };
 
     struct PutParams {

src/rgw/driver/rados/rgw_metadata.h

@@ -15,7 +15,6 @@
 #include "cls/log/cls_log_types.h"
 #include "common/RefCountedObj.h"
 #include "common/ceph_time.h"
-#include "services/svc_meta_be.h"
 #include "rgw_sal_fwd.h"
 
 
@@ -54,18 +53,11 @@ class RGWMetadataManager;
 class RGWMetadataHandler {
   friend class RGWMetadataManager;
 
-protected:
-  CephContext *cct;
-
 public:
   RGWMetadataHandler() {}
   virtual ~RGWMetadataHandler();
   virtual std::string get_type() = 0;
 
-  void base_init(CephContext *_cct) {
-    cct = _cct;
-  }
-
   virtual RGWMetadataObject *get_meta_obj(JSONObj *jo, const obj_version& objv, const ceph::real_time& mtime) = 0;
 
   virtual int get(std::string& entry, RGWMetadataObject **obj, optional_yield, const DoutPrefixProvider *dpp) = 0;
@@ -99,140 +91,20 @@ class RGWMetadataHandler {
   virtual int attach(RGWMetadataManager *manager);
 };
 
-class RGWMetadataHandler_GenericMetaBE : public RGWMetadataHandler {
-  friend class RGWSI_MetaBackend;
-  friend class RGWMetadataManager;
-  friend class Put;
-
-public:
-  class Put;
-
-protected:
-  RGWSI_MetaBackend_Handler *be_handler;
-
-  virtual int do_get(RGWSI_MetaBackend_Handler::Op *op, std::string& entry, RGWMetadataObject **obj, optional_yield y, const DoutPrefixProvider *dpp) = 0;
-  virtual int do_put(RGWSI_MetaBackend_Handler::Op *op, std::string& entry, RGWMetadataObject *obj,
-                     RGWObjVersionTracker& objv_tracker, optional_yield y,
-                     const DoutPrefixProvider *dpp, RGWMDLogSyncType type, 
-                     bool from_remote_zone) = 0;
-  virtual int do_put_operate(Put *put_op, const DoutPrefixProvider *dpp);
-  virtual int do_remove(RGWSI_MetaBackend_Handler::Op *op, std::string& entry, RGWObjVersionTracker& objv_tracker, optional_yield y, const DoutPrefixProvider *dpp) = 0;
-
-public:
-  RGWMetadataHandler_GenericMetaBE() {}
-
-  void base_init(CephContext *_cct,
-            RGWSI_MetaBackend_Handler *_be_handler) {
-    RGWMetadataHandler::base_init(_cct);
-    be_handler = _be_handler;
-  }
-
-  RGWSI_MetaBackend_Handler *get_be_handler() {
-    return be_handler;
-  }
-
-  class Put {
-  protected:
-    RGWMetadataHandler_GenericMetaBE *handler;
-    RGWSI_MetaBackend_Handler::Op *op;
-    std::string& entry;
-    RGWMetadataObject *obj;
-    RGWObjVersionTracker& objv_tracker;
-    RGWMDLogSyncType apply_type;
-    optional_yield y;
-    bool from_remote_zone{false};
-
-    int get(RGWMetadataObject **obj, const DoutPrefixProvider *dpp) {
-      return handler->do_get(op, entry, obj, y, dpp);
-    }
-  public:
-    Put(RGWMetadataHandler_GenericMetaBE *_handler, RGWSI_MetaBackend_Handler::Op *_op,
-        std::string& _entry, RGWMetadataObject *_obj,
-        RGWObjVersionTracker& _objv_tracker, optional_yield _y,
-        RGWMDLogSyncType _type, bool from_remote_zone);
-
-    virtual ~Put() {}
-
-    virtual int put_pre(const DoutPrefixProvider *dpp) {
-      return 0;
-    }
-    virtual int put(const DoutPrefixProvider *dpp) {
-      return 0;
-    }
-    virtual int put_post(const DoutPrefixProvider *dpp) {
-      return 0;
-    }
-    virtual int finalize() {
-      return 0;
-    }
-  };
-
-  int get(std::string& entry, RGWMetadataObject **obj, optional_yield, const DoutPrefixProvider *dpp) override;
-  int put(std::string& entry, RGWMetadataObject *obj, RGWObjVersionTracker& objv_tracker, optional_yield, const DoutPrefixProvider *dpp, RGWMDLogSyncType type, bool from_remote_zone) override;
-  int remove(std::string& entry, RGWObjVersionTracker& objv_tracker, optional_yield, const DoutPrefixProvider *dpp) override;
-
-  int mutate(const std::string& entry,
-	     const ceph::real_time& mtime,
-	     RGWObjVersionTracker *objv_tracker,
-             optional_yield y,
-             const DoutPrefixProvider *dpp,
-	     RGWMDLogStatus op_type,
-	     std::function<int()> f) override;
-
-  int get_shard_id(const std::string& entry, int *shard_id) override;
-
-  int list_keys_init(const DoutPrefixProvider *dpp, const std::string& marker, void **phandle) override;
-  int list_keys_next(const DoutPrefixProvider *dpp, void *handle, int max, std::list<std::string>& keys, bool *truncated) override;
-  void list_keys_complete(void *handle) override;
-
-  std::string get_marker(void *handle) override;
-
-  /**
-   * Compare an incoming versus on-disk tag/version+mtime combo against
-   * the sync mode to see if the new one should replace the on-disk one.
-   *
-   * @return true if the update should proceed, false otherwise.
-   */
-  static bool check_versions(bool exists,
-                             const obj_version& ondisk, const real_time& ondisk_time,
-                             const obj_version& incoming, const real_time& incoming_time,
-                             RGWMDLogSyncType sync_mode) {
-    switch (sync_mode) {
-    case APPLY_UPDATES:
-      if ((ondisk.tag != incoming.tag) ||
-	  (ondisk.ver >= incoming.ver))
-	return false;
-      break;
-    case APPLY_NEWER:
-      if (ondisk_time >= incoming_time)
-	return false;
-      break;
-    case APPLY_EXCLUSIVE:
-      if (exists)
-        return false;
-      break;
-    case APPLY_ALWAYS: //deliberate fall-thru -- we always apply!
-    default: break;
-    }
-    return true;
-  }
-};
-
 class RGWMetadataTopHandler;
 
 class RGWMetadataManager {
   friend class RGWMetadataHandler;
 
   CephContext *cct;
-  RGWSI_Meta *meta_svc;
   std::map<std::string, RGWMetadataHandler *> handlers;
   std::unique_ptr<RGWMetadataTopHandler> md_top_handler;
 
   int find_handler(const std::string& metadata_key, RGWMetadataHandler **handler, std::string& entry);
   int register_handler(RGWMetadataHandler *handler);
 
 public:
-  RGWMetadataManager(RGWSI_Meta *_meta_svc);
+  RGWMetadataManager();
   ~RGWMetadataManager();
 
   RGWMetadataHandler *get_handler(const std::string& type);
@@ -269,29 +141,6 @@ class RGWMetadataManager {
   int get_shard_id(const std::string& section, const std::string& key, int *shard_id);
 };
 
-class RGWMetadataHandlerPut_SObj : public RGWMetadataHandler_GenericMetaBE::Put
-{
-protected:
-  std::unique_ptr<RGWMetadataObject> oo;
-  RGWMetadataObject *old_obj{nullptr};
-  bool exists{false};
-
-public:
-  RGWMetadataHandlerPut_SObj(RGWMetadataHandler_GenericMetaBE *handler, RGWSI_MetaBackend_Handler::Op *op,
-                             std::string& entry, RGWMetadataObject *obj, RGWObjVersionTracker& objv_tracker,
-			     optional_yield y,
-                             RGWMDLogSyncType type, bool from_remote_zone);
-  ~RGWMetadataHandlerPut_SObj();
-
-  int put_pre(const DoutPrefixProvider *dpp) override;
-  int put(const DoutPrefixProvider *dpp) override;
-  virtual int put_check(const DoutPrefixProvider *dpp) {
-    return 0;
-  }
-  virtual int put_checked(const DoutPrefixProvider *dpp);
-  virtual void encode_obj(bufferlist *bl) {}
-};
-
 void rgw_shard_name(const std::string& prefix, unsigned max_shards, const std::string& key, std::string& name, int *shard_id);
 void rgw_shard_name(const std::string& prefix, unsigned max_shards, const std::string& section, const std::string& key, std::string& name);
 void rgw_shard_name(const std::string& prefix, unsigned shard_id, std::string& name);

src/rgw/driver/rados/rgw_sal_rados.cc

@@ -57,8 +57,6 @@
 #include "rgw_rest_user.h"
 #include "services/svc_sys_obj.h"
 #include "services/svc_mdlog.h"
-#include "services/svc_meta.h"
-#include "services/svc_meta_be_sobj.h"
 #include "services/svc_cls.h"
 #include "services/svc_bilog_rados.h"
 #include "services/svc_bi_rados.h"
@@ -572,21 +570,18 @@ int RadosBucket::load_bucket(const DoutPrefixProvider* dpp, optional_yield y)
 {
   int ret;
 
-  RGWSI_MetaBackend_CtxParams bectx_params = RGWSI_MetaBackend_CtxParams_SObj();
   RGWObjVersionTracker ep_ot;
   if (info.bucket.bucket_id.empty()) {
     ret = store->ctl()->bucket->read_bucket_info(info.bucket, &info, y, dpp,
 				      RGWBucketCtl::BucketInstance::GetParams()
 				      .set_mtime(&mtime)
-				      .set_attrs(&attrs)
-                                      .set_bectx_params(bectx_params),
+				      .set_attrs(&attrs),
 				      &ep_ot);
   } else {
     ret  = store->ctl()->bucket->read_bucket_instance_info(info.bucket, &info, y, dpp,
 				      RGWBucketCtl::BucketInstance::GetParams()
 				      .set_mtime(&mtime)
-				      .set_attrs(&attrs)
-				      .set_bectx_params(bectx_params));
+				      .set_attrs(&attrs));
   }
   if (ret != 0) {
     return ret;

src/rgw/driver/rados/rgw_service.cc

@@ -11,9 +11,6 @@
 #include "services/svc_cls.h"
 #include "services/svc_config_key_rados.h"
 #include "services/svc_mdlog.h"
-#include "services/svc_meta.h"
-#include "services/svc_meta_be.h"
-#include "services/svc_meta_be_sobj.h"
 #include "services/svc_notify.h"
 #include "services/svc_zone.h"
 #include "services/svc_zone_utils.h"
@@ -66,8 +63,6 @@ int RGWServices_Def::init(CephContext *cct,
   config_key_rados = std::make_unique<RGWSI_ConfigKey_RADOS>(cct);
   datalog_rados = std::make_unique<RGWDataChangesLog>(cct);
   mdlog = std::make_unique<RGWSI_MDLog>(cct, run_sync);
-  meta = std::make_unique<RGWSI_Meta>(cct);
-  meta_be_sobj = std::make_unique<RGWSI_MetaBackend_SObj>(cct);
   notify = std::make_unique<RGWSI_Notify>(cct);
   zone = std::make_unique<RGWSI_Zone>(cct);
   zone_utils = std::make_unique<RGWSI_ZoneUtils>(cct);
@@ -83,15 +78,13 @@ int RGWServices_Def::init(CephContext *cct,
     sysobj_cache = std::make_unique<RGWSI_SysObj_Cache>(dpp, cct);
   }
 
-  vector<RGWSI_MetaBackend *> meta_bes{meta_be_sobj.get()};
-
   async_processor->start();
   finisher->init();
   bi_rados->init(zone.get(), driver->getRados()->get_rados_handle(),
 		 bilog_rados.get(), datalog_rados.get());
   bilog_rados->init(bi_rados.get());
   bucket_sobj->init(zone.get(), sysobj.get(), sysobj_cache.get(),
-                    bi_rados.get(), meta.get(), mdlog.get(),
+                    bi_rados.get(), mdlog.get(),
                     sync_modules.get(), bucket_sync_sobj.get());
   bucket_sync_sobj->init(zone.get(),
                          sysobj.get(),
@@ -101,8 +94,6 @@ int RGWServices_Def::init(CephContext *cct,
   config_key_rados->init(driver->getRados()->get_rados_handle());
   mdlog->init(driver->getRados()->get_rados_handle(), zone.get(), sysobj.get(),
 	      cls.get(), async_processor.get());
-  meta->init(sysobj.get(), mdlog.get(), meta_bes);
-  meta_be_sobj->init(sysobj.get(), mdlog.get());
   notify->init(zone.get(), driver->getRados()->get_rados_handle(),
 	       finisher.get());
   zone->init(sysobj.get(), driver->getRados()->get_rados_handle(),
@@ -117,8 +108,8 @@ int RGWServices_Def::init(CephContext *cct,
   } else {
     sysobj->init(driver->getRados()->get_rados_handle(), sysobj_core.get());
   }
-  user_rados->init(driver->getRados()->get_rados_handle(), zone.get(), mdlog.get(),
-                   sysobj.get(), sysobj_cache.get(), meta.get());
+  user_rados->init(driver->getRados()->get_rados_handle(), zone.get(),
+                   mdlog.get(), sysobj.get(), sysobj_cache.get());
 
   can_shutdown = true;
 
@@ -209,18 +200,6 @@ int RGWServices_Def::init(CephContext *cct,
   }
 
   if (!raw) {
-    r = meta_be_sobj->start(y, dpp);
-    if (r < 0) {
-      ldpp_dout(dpp, 0) << "ERROR: failed to start meta_be_sobj service (" << cpp_strerror(-r) << dendl;
-      return r;
-    }
-
-    r = meta->start(y, dpp);
-    if (r < 0) {
-      ldpp_dout(dpp, 0) << "ERROR: failed to start meta service (" << cpp_strerror(-r) << dendl;
-      return r;
-    }
-
     r = bucket_sobj->start(y, dpp);
     if (r < 0) {
       ldpp_dout(dpp, 0) << "ERROR: failed to start bucket service (" << cpp_strerror(-r) << dendl;
@@ -259,8 +238,6 @@ void RGWServices_Def::shutdown()
   user_rados->shutdown();
   sync_modules->shutdown();
   notify->shutdown();
-  meta_be_sobj->shutdown();
-  meta->shutdown();
   mdlog->shutdown();
   config_key_rados->shutdown();
   cls->shutdown();
@@ -307,8 +284,6 @@ int RGWServices::do_init(CephContext *_cct, rgw::sal::RadosStore* driver, bool h
   config_key = config_key_rados;
   datalog_rados = _svc.datalog_rados.get();
   mdlog = _svc.mdlog.get();
-  meta = _svc.meta.get();
-  meta_be_sobj = _svc.meta_be_sobj.get();
   notify = _svc.notify.get();
   zone = _svc.zone.get();
   zone_utils = _svc.zone_utils.get();
@@ -353,7 +328,7 @@ RGWCtlDef::_meta::~_meta() {}
 int RGWCtlDef::init(RGWServices& svc, rgw::sal::Driver* driver,
                     librados::Rados& rados, const DoutPrefixProvider *dpp)
 {
-  meta.mgr.reset(new RGWMetadataManager(svc.meta));
+  meta.mgr.reset(new RGWMetadataManager());
 
   meta.user = create_user_metadata_handler(svc.user);