import ceph quincy 17.2.6

[ceph.git] / ceph / src / rgw / rgw_lc.cc

diff --git a/ceph/src/rgw/rgw_lc.cc b/ceph/src/rgw/rgw_lc.cc
index 31822d862c60577802cccf9576638c165197ae33..6dad16efc8086e4508f682ab895aac58e04895c7 100644 (file)
--- a/ceph/src/rgw/rgw_lc.cc
+++ b/ceph/src/rgw/rgw_lc.cc
@@ -1454,25 +1454,16 @@ public:
     tier_ctx.multipart_sync_threshold = oc.tier.t.s3.multipart_sync_threshold;
     tier_ctx.storage_class = oc.tier.storage_class;
 
-    // check if target_path is already created
     std::set<std::string>& cloud_targets = oc.env.worker->get_cloud_targets();
-    std::pair<std::set<std::string>::iterator, bool> it;
-
-    it = cloud_targets.insert(bucket_name);
-    tier_ctx.target_bucket_created = !(it.second);
 
     ldpp_dout(oc.dpp, 0) << "Transitioning object(" << oc.o.key << ") to the cloud endpoint(" << endpoint << ")" << dendl;
 
     /* Transition object to cloud end point */
-    int ret = rgw_cloud_tier_transfer_object(tier_ctx);
+    int ret = rgw_cloud_tier_transfer_object(tier_ctx, cloud_targets);
 
     if (ret < 0) {
       ldpp_dout(oc.dpp, 0) << "ERROR: failed to transfer object(" << oc.o.key << ") to the cloud endpoint(" << endpoint << ") ret=" << ret << dendl;
       return ret;
-
-      if (!tier_ctx.target_bucket_created) {
-        cloud_targets.erase(it.first);
-      }
     }
 
     if (delete_object) {