From c19b02cfc9644710964cba689a272782b7064a12 Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Mon, 19 Aug 2024 14:15:59 +0200 Subject: [PATCH] rgw: send self zonegroup on forward to master When creating a bucket in the secondary zonegroup, the `rgwx-zonegroup` is mistakenly set to the master zonegroup when forwarding the request. Instead, it should be set to the secondary zonegroup so that the master zonegroup creates the bucket for the intended zonegroup rather than for itself. Fixes: https://tracker.ceph.com/issues/67610 Signed-off-by: Seena Fallah (cherry picked from commit a8e112cf538dfea238a88f52c32da3db35f58c8a) --- src/rgw/rgw_op.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 1b2e71509837f..c2cfc1ba19cd6 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -141,7 +141,7 @@ int rgw_forward_request_to_master(const DoutPrefixProvider* dpp, // use the master zone's endpoints auto conn = RGWRESTConn{dpp->get_cct(), z->second.id, z->second.endpoints, - creds, zg->second.id, zg->second.api_name}; + creds, site.get_zonegroup().id, zg->second.api_name}; bufferlist outdata; constexpr size_t max_response_size = 128 * 1024; // we expect a very small response int ret = conn.forward(dpp, effective_owner, req, nullptr, -- 2.39.5