From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 27 Feb 2017 16:43:25 +0000 (+0100)
Subject: aws: use slashes in obj name
X-Git-Tag: v13.1.0~270^2~104
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0ff59a22bad5e2c35bb6984d9a55b3996fb9b343;p=ceph-ci.git

aws: use slashes in obj name

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_sync_module_aws.cc b/src/rgw/rgw_sync_module_aws.cc
index 524dbef994a..433972d3dbd 100644
--- a/src/rgw/rgw_sync_module_aws.cc
+++ b/src/rgw/rgw_sync_module_aws.cc
@@ -24,9 +24,9 @@ static string aws_object_name(const RGWBucketInfo& bucket_info, const rgw_obj_ke
   string bucket_name = aws_bucket_name(bucket_info, user_buckets);
   string object_name = bucket_name+"/";
   if (!user_buckets){
-    object_name += bucket_info.bucket.name;
+    object_name += bucket_info.owner.tenant + bucket_info.owner.id + "/";
   }
-  object_name += key.name;
+  object_name += bucket_info.bucket.name + "/" + key.name;
   return object_name;
 }