From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 4 Apr 2017 14:41:51 +0000 (-0400)
Subject: rgw: use zonegroup's master zone endpoints for bucket redirect
X-Git-Tag: v10.2.10~122^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45f0396cffe528a752fb8330d2323e1de8d8b8ac;p=ceph.git

rgw: use zonegroup's master zone endpoints for bucket redirect

if no zonegroup endpoints are set, fall back to master zone endpoints

Fixes: http://tracker.ceph.com/issues/19488

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 92f63c6392bdc4633a2e57cb3867051bb1a3fd55)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 3af17ddcdeca..937f24d0a211 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -369,6 +369,12 @@ int rgw_build_bucket_policies(RGWRados* store, struct req_state* s)
     if (!r) {
       if (!zonegroup.endpoints.empty()) {
 	s->zonegroup_endpoint = zonegroup.endpoints.front();
+      } else {
+        // use zonegroup's master zone endpoints
+        auto z = zonegroup.zones.find(zonegroup.master_zone);
+        if (z != zonegroup.zones.end() && !z->second.endpoints.empty()) {
+          s->zonegroup_endpoint = z->second.endpoints.front();
+        }
       }
       s->zonegroup_name = zonegroup.get_name();
     }