From 31b610be087da73cdb27dcaabfa282a3ef1ec53a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 13 Oct 2017 16:47:38 -0700 Subject: [PATCH] rgw: aws sync module, fix target object naming Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_sync_module_aws.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_sync_module_aws.cc b/src/rgw/rgw_sync_module_aws.cc index 07631aa1f6f8e..dd9cb8ae263a8 100644 --- a/src/rgw/rgw_sync_module_aws.cc +++ b/src/rgw/rgw_sync_module_aws.cc @@ -24,10 +24,8 @@ static string aws_bucket_name(const RGWBucketInfo& bucket_info, bool user_bucket static string aws_object_name(const RGWBucketInfo& bucket_info, const rgw_obj_key&key, bool user_buckets=false){ string bucket_name = aws_bucket_name(bucket_info, user_buckets); - string object_name = bucket_name+"/"; - if (!user_buckets){ - object_name += bucket_info.owner.tenant + bucket_info.owner.id + "/"; - } + string object_name; + object_name += bucket_info.owner.to_str() + "/"; object_name += bucket_info.bucket.name + "/" + key.name; return object_name; } @@ -80,7 +78,7 @@ public: } } - ldout(sync_env->cct, 20) << __func << ":" << " headers=" << headers << " extra_data.length()=" << extra_data.length() << dendl; + ldout(sync_env->cct, 20) << __func__ << ":" << " headers=" << headers << " extra_data.length()=" << extra_data.length() << dendl; return 0; @@ -262,7 +260,7 @@ public: ldout(sync_env->cct, 0) << ": remove remote obj: z=" << sync_env->source_zone << " b=" << bucket_info.bucket << " k=" << key << " mtime=" << mtime << dendl; yield { - string path = aws_object_name(bucket_info, key); + string path = aws_bucket_name(bucket_info) + "/" + aws_object_name(bucket_info, key); ldout(sync_env->cct, 0) << "AWS: removing aws object at" << path << dendl; call(new RGWDeleteRESTResourceCR(sync_env->cct, conf.conn.get(), sync_env->http_manager, -- 2.39.5