rgw/services: remove unused RGWSI_Role_RADOS

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

Author: cbodley

src/rgw/CMakeLists.txt

@@ -46,7 +46,6 @@ set(librgw_common_srcs
   services/svc_notify.cc
   services/svc_quota.cc
   services/svc_sync_modules.cc
-  services/svc_role_rados.cc
   services/svc_sys_obj.cc
   services/svc_sys_obj_cache.cc
   services/svc_sys_obj_core.cc

src/rgw/driver/rados/rgw_sal_rados.cc

@@ -67,7 +67,6 @@
 #include "services/svc_quota.h"
 #include "services/svc_config_key.h"
 #include "services/svc_zone_utils.h"
-#include "services/svc_role_rados.h"
 #include "services/svc_user.h"
 #include "services/svc_sys_obj_cache.h"
 #include "cls/rgw/cls_rgw_client.h"

src/rgw/driver/rados/rgw_service.cc

@@ -23,7 +23,6 @@
 #include "services/svc_sys_obj_cache.h"
 #include "services/svc_sys_obj_core.h"
 #include "services/svc_user_rados.h"
-#include "services/svc_role_rados.h"
 
 #include "common/errno.h"
 
@@ -77,7 +76,6 @@ int RGWServices_Def::init(CephContext *cct,
   sysobj = std::make_unique<RGWSI_SysObj>(cct);
   sysobj_core = std::make_unique<RGWSI_SysObj_Core>(cct);
   user_rados = std::make_unique<RGWSI_User_RADOS>(cct);
-  role_rados = std::make_unique<RGWSI_Role_RADOS>(cct);
   async_processor = std::make_unique<RGWAsyncRadosProcessor>(
     cct, cct->_conf->rgw_num_async_rados_threads);
 
@@ -121,7 +119,7 @@ int RGWServices_Def::init(CephContext *cct,
   }
   user_rados->init(driver->getRados()->get_rados_handle(), zone.get(), mdlog.get(),
                    sysobj.get(), sysobj_cache.get(), meta.get());
-  role_rados->init(zone.get(), meta.get(), meta_be_sobj.get(), sysobj.get());
+
   can_shutdown = true;
 
   int r = finisher->start(y, dpp);
@@ -240,12 +238,6 @@ int RGWServices_Def::init(CephContext *cct,
       ldpp_dout(dpp, 0) << "ERROR: failed to start user_rados service (" << cpp_strerror(-r) << dendl;
       return r;
     }
-
-    r = role_rados->start(y, dpp);
-    if (r < 0) {
-      ldout(cct, 0) << "ERROR: failed to start role_rados service (" << cpp_strerror(-r) << dendl;
-      return r;
-    }
   }
 
   /* cache or core services will be started by sysobj */
@@ -263,7 +255,6 @@ void RGWServices_Def::shutdown()
     return;
   }
 
-  role_rados->shutdown();
   datalog_rados.reset();
   user_rados->shutdown();
   sync_modules->shutdown();
@@ -327,7 +318,6 @@ int RGWServices::do_init(CephContext *_cct, rgw::sal::RadosStore* driver, bool h
   cache = _svc.sysobj_cache.get();
   core = _svc.sysobj_core.get();
   user = _svc.user_rados.get();
-  role = _svc.role_rados.get();
   async_processor = _svc.async_processor.get();
 
   return 0;

src/rgw/driver/rados/rgw_service.h

@@ -78,7 +78,6 @@ class RGWSI_SysObj_Cache;
 class RGWSI_User;
 class RGWSI_User_RADOS;
 class RGWDataChangesLog;
-class RGWSI_Role_RADOS;
 class RGWAsyncRadosProcessor;
 
 struct RGWServices_Def
@@ -106,7 +105,6 @@ struct RGWServices_Def
   std::unique_ptr<RGWSI_SysObj_Cache> sysobj_cache;
   std::unique_ptr<RGWSI_User_RADOS> user_rados;
   std::unique_ptr<RGWDataChangesLog> datalog_rados;
-  std::unique_ptr<RGWSI_Role_RADOS> role_rados;
   std::unique_ptr<RGWAsyncRadosProcessor> async_processor;
 
   RGWServices_Def();
@@ -151,7 +149,6 @@ struct RGWServices
   RGWSI_SysObj_Cache *cache{nullptr};
   RGWSI_SysObj_Core *core{nullptr};
   RGWSI_User *user{nullptr};
-  RGWSI_Role_RADOS *role{nullptr};
   RGWAsyncRadosProcessor* async_processor;
 
   int do_init(CephContext *cct, rgw::sal::RadosStore* store, bool have_cache,

src/rgw/rgw_role.cc

@@ -26,7 +26,6 @@
 #include "services/svc_sys_obj.h"
 #include "services/svc_meta_be_sobj.h"
 #include "services/svc_meta.h"
-#include "services/svc_role_rados.h"
 
 #define dout_subsys ceph_subsys_rgw