From: Chang Liu <liuchang0812@gmail.com>
Date: Fri, 14 Jun 2019 06:42:45 +0000 (+0800)
Subject: fixup! rgw: RGWSetRequestPayment request should be forwarded to master zone
X-Git-Tag: v14.2.3~133^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28485cc4e6a1d974d783edb023fd2cd21730068d;p=ceph.git

fixup! rgw: RGWSetRequestPayment request should be forwarded to master zone

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
(cherry picked from commit 73370efca197b13bf9888983546542ad2d61ee31)

Conflicts:
	src/rgw/rgw_rest_s3.cc
- nautilus uses "ldout" where master has "ldpp_dout", but this is irrelevant here
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 1be0253e9b7..c34ac89be88 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -2591,14 +2591,12 @@ int RGWSetRequestPayment_ObjStore_S3::get_params()
   const auto max_size = s->cct->_conf->rgw_max_put_param_size;
 
   int r = 0;
-  bufferlist data;
-  std::tie(r, data) = rgw_rest_read_all_input(s, max_size, false);
+  std::tie(r, in_data) = rgw_rest_read_all_input(s, max_size, false);
 
   if (r < 0) {
     return r;
   }
 
-  in_data.append(data);
 
   RGWSetRequestPaymentParser parser;
 
@@ -2607,8 +2605,8 @@ int RGWSetRequestPayment_ObjStore_S3::get_params()
     return -EIO;
   }
 
-  char* buf = data.c_str();
-  if (!parser.parse(buf, data.length(), 1)) {
+  char* buf = in_data.c_str();
+  if (!parser.parse(buf, in_data.length(), 1)) {
     ldout(s->cct, 10) << "failed to parse data: " << buf << dendl;
     return -EINVAL;
   }