rgw: remove unneeded #warnings

and other cleanups

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 02cb1c5b1a27d6a9394da8428f823e54546acef2..3ee7271e076fad712d3f4b226e98519f1e1e9bf6 100644 (file)
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -3739,7 +3739,6 @@ int RGWBucketShardFullSyncCR::operate()
         if (!marker_tracker.start(entry->key, total_entries, real_time())) {
           tn->log(0, SSTR("ERROR: cannot start syncing " << entry->key << ". Duplicate entry?"));
         } else {
-#warning look in here
           using SyncCR = RGWBucketSyncSingleEntryCR<rgw_obj_key, rgw_obj_key>;
           yield spawn(new SyncCR(sc, sync_pipe, entry->key,
                                  false, /* versioned, only matters for object removal */
@@ -4334,9 +4333,6 @@ int RGWRunBucketSourcesSyncCR::operate()
       }
     }
 
-#if 0
-    lease_cr->go_down();
-#endif
     drain_all();
     return set_cr_done();
   }

diff --git a/src/rgw/services/svc_bi_rados.cc b/src/rgw/services/svc_bi_rados.cc
index 5aac1ea47d5ff2788937459b96fa626159aded89..3ef0b6f09c21b97d5610f2d7afde557f75db00ca 100644 (file)
--- a/src/rgw/services/svc_bi_rados.cc
+++ b/src/rgw/services/svc_bi_rados.cc
@@ -411,7 +411,6 @@ int RGWSI_BucketIndex_RADOS::get_reshard_status(const RGWBucketInfo& bucket_info
 int RGWSI_BucketIndex_RADOS::handle_overwrite(const RGWBucketInfo& info,
                                               const RGWBucketInfo& orig_info)
 {
-#warning needs to be done differently
   bool new_sync_enabled = info.datasync_flag_enabled();
   bool old_sync_enabled = orig_info.datasync_flag_enabled();
 

diff --git a/src/rgw/services/svc_bucket_sobj.cc b/src/rgw/services/svc_bucket_sobj.cc
index b276969e72d06399bb5a7c2301e7f493bec4b1a7..122a74d5dfeac580477c751396cf335d6b9d9ad9 100644 (file)
--- a/src/rgw/services/svc_bucket_sobj.cc
+++ b/src/rgw/services/svc_bucket_sobj.cc
@@ -300,7 +300,6 @@ int RGWSI_Bucket_SObj::read_bucket_instance_info(RGWSI_Bucket_BI_Ctx& ctx,
                                   &ci, refresh_version, y);
   *info = e.info;
 
-#warning FIXME: use unique_ptr and implement RGWBucketInfo copy constructor, or other better solution
   if (info->sync_policy) { /* fork policy off cache */
     auto policy = make_shared<rgw_sync_policy_info>(*info->sync_policy);
     info->sync_policy = std::const_pointer_cast<const rgw_sync_policy_info>(policy);