]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: add tenant to url for RGWRESTStreamWriteRequest
authorCasey Bodley <cbodley@redhat.com>
Thu, 30 Jun 2016 21:43:40 +0000 (17:43 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 24 Aug 2016 18:05:19 +0000 (14:05 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2a1e1a776c58f62fbcb57877d56b92eb1e8933e6)

src/rgw/rgw_rest_client.cc

index b219e6f154296b2b07a73ca35d8686174a87a30b..e29b16014e971e616b03bd3009b8074fd70906af 100644 (file)
@@ -607,7 +607,7 @@ int RGWRESTStreamWriteRequest::complete(string& etag, real_time *mtime)
 int RGWRESTStreamRWRequest::get_obj(RGWAccessKey& key, map<string, string>& extra_headers, rgw_obj& obj)
 {
   string urlsafe_bucket, urlsafe_object;
-  url_encode(obj.bucket.name, urlsafe_bucket);
+  url_encode(obj.bucket.get_key(':', 0), urlsafe_bucket);
   url_encode(obj.get_orig_obj(), urlsafe_object);
   string resource = urlsafe_bucket + "/" + urlsafe_object;