From: Enming Zhang <enming.zhang@umcloud.com>
Date: Wed, 30 May 2018 02:54:42 +0000 (+0800)
Subject: rgw: fix issue for CreateBucket with BucketLocation param under default zonegroup
X-Git-Tag: v12.2.13~119^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68cebe96b3db3dfc6f93c2372d82017f7b14c603;p=ceph.git

rgw: fix issue for CreateBucket with BucketLocation param under default zonegroup

Because there is not a default realm, the has_zonegroup_api always returns false
when create bucket with the BucketLocation parameter under default zonegroup,
which always leads to the CreateBucket with BucketLocation parameter request failed.

Fixes: https://tracker.ceph.com/issues/41401

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit 18115915fa861a4b32e8d442266e90e9589215f7)
---

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index f19e10d3951..89e982f52ac 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -2499,6 +2499,8 @@ public:
       const auto& zonegroups_by_api = current_period.get_map().zonegroups_by_api;
       if (zonegroups_by_api.find(api) != zonegroups_by_api.end())
         return true;
+    } else if (zonegroup.api_name == api) {
+        return true;
     }
     return false;
   }