rgw: archive: remove dead code and minor fixes

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 00a7b5c297e6aa10df709ca5b28b143c2ee07502..7986565c8eaacf5218927101567719ca8ff1e419 100644 (file)
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -1691,8 +1691,6 @@ class RGWArchiveDataSyncModule : public RGWDefaultDataSyncModule {
 public:
   RGWArchiveDataSyncModule() {}
 
-  void init(RGWDataSyncEnv *sync_env, uint64_t instance_id) override;
-
   RGWCoroutine *sync_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, std::optional<uint64_t> versioned_epoch, rgw_zone_set *zones_trace) override;
   RGWCoroutine *remove_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, real_time& mtime, bool versioned, uint64_t versioned_epoch, rgw_zone_set *zones_trace) override;
   RGWCoroutine *create_delete_marker(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, real_time& mtime,
@@ -1720,20 +1718,6 @@ int RGWArchiveSyncModule::create_instance(CephContext *cct, const JSONFormattabl
   return 0;
 }
 
-void RGWArchiveDataSyncModule::init(RGWDataSyncEnv *sync_env, uint64_t instance_id) {
-
-  ldout(sync_env->cct, 0) << "Switching to archive zone metadata manager" << dendl;
-
-  // FIXME: this code crashes... migrating the current state (handles, md_logs,
-  // current_log...) in meta_mgr raises errors (threads, locks ...)
-
-  //RGWMetadataManager *current_meta_mgr = sync_env->store->meta_mgr;
-  //RGWMetadataManager *new_meta_mgr = new RGWArchiveMetadataManager(sync_env->cct, sync_env->store);
-  //new_meta_mgr.update_state_from(current_meta_mgr);
-  //delete current_meta_mgr;
-  //current_meta_mgr = new_meta_mgr;
-}
-
 RGWCoroutine *RGWArchiveDataSyncModule::sync_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, std::optional<uint64_t> versioned_epoch, rgw_zone_set *zones_trace)
 {
   ldout(sync_env->cct, 0) << "SYNC_ARCHIVE: sync_object: b=" << bucket_info.bucket << " k=" << key << " versioned_epoch=" << versioned_epoch.value_or(0) << dendl;

diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 3629ce653288010a5221ee3c04ba3c451d9d226b..44ceb2ecea2f4fda05d06720c906ad7544877116 100644 (file)
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -342,12 +342,6 @@ RGWMetadataManager::RGWMetadataManager(CephContext *_cct, RGWRados *_store)
 {
 }
 
-RGWArchiveMetadataManager::RGWArchiveMetadataManager(CephContext *_cct, RGWRados *_store)
-  : RGWMetadataManager(_cct, _store)
-{
-    ldout(store->ctx(), 0) << "RGWArchiveMetadataManager() constructor check" << dendl;
-}
-
 RGWMetadataManager::~RGWMetadataManager()
 {
   map<string, RGWMetadataHandler *>::iterator iter;

diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h
index 8c19dfba1eb70a922d9d779f59101385b84e98dc..e410767704b8ac025fcaf6eaba8a9bb7a6da2ec1 100644 (file)
--- a/src/rgw/rgw_metadata.h
+++ b/src/rgw/rgw_metadata.h
@@ -293,6 +293,8 @@ WRITE_CLASS_ENCODER(RGWMetadataLogHistory)
 
 class RGWMetadataManager {
   map<string, RGWMetadataHandler *> handlers;
+  CephContext *cct;
+  RGWRados *store;
 
   // maintain a separate metadata log for each period
   std::map<std::string, RGWMetadataLog> md_logs;
@@ -316,10 +318,6 @@ class RGWMetadataManager {
                      RGWObjVersionTracker *objv_tracker,
                      RGWMetadataHandler::sync_type_t sync_mode);
 
-protected:
-  CephContext *cct;
-  RGWRados *store;
-
 public:
   RGWMetadataManager(CephContext *_cct, RGWRados *_store);
   ~RGWMetadataManager();
@@ -425,9 +423,4 @@ int RGWMetadataManager::mutate(RGWMetadataHandler *handler, const string& key,
   return 0;
 }
 
-class RGWArchiveMetadataManager : public RGWMetadataManager {
-public:
-  RGWArchiveMetadataManager(CephContext *_cct, RGWRados *_store);
-};
-
 #endif