From: Huber-ming <zhangsm01@inspur.com>
Date: Thu, 8 Sep 2022 03:39:45 +0000 (+0800)
Subject: rgw: set requestPayment in slave zone
X-Git-Tag: v18.1.0~1137^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9da174ef7fb7021300ef34e872521659ec2a96fe;p=ceph.git

rgw: set requestPayment in slave zone
firx: https://tracker.ceph.com/issues/57468

Signed-off-by: Huber-ming <zhangsm01@inspur.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index acdb506e51dc..aabb6aedf370 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6131,17 +6131,16 @@ void RGWSetRequestPayment::pre_exec()
 void RGWSetRequestPayment::execute(optional_yield y)
 {
 
+  op_ret = get_params(y);
+  if (op_ret < 0)
+    return;
+  
   op_ret = store->forward_request_to_master(this, s->user.get(), nullptr, in_data, nullptr, s->info, y);
   if (op_ret < 0) {
     ldpp_dout(this, 0) << "forward_request_to_master returned ret=" << op_ret << dendl;
     return;
   }
 
-  op_ret = get_params(y);
-
-  if (op_ret < 0)
-    return;
-
   s->bucket->get_info().requester_pays = requester_pays;
   op_ret = s->bucket->put_info(this, false, real_time());
   if (op_ret < 0) {