]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: RGWPeriodPusher uses zone system key for inter-zonegroup messages 29256/head
authorCasey Bodley <cbodley@redhat.com>
Sat, 13 Apr 2019 15:34:21 +0000 (11:34 -0400)
committerNathan Cutler <ncutler@suse.com>
Wed, 24 Jul 2019 11:19:52 +0000 (13:19 +0200)
RGWPeriodPusher was using an empty RGWAccessKey for inter-zonegroup
messages, which were rejected as an anonymous user with 403 Forbidden.
this prevented multi-zonegroup configurations from converging on the
same period configuration

Fixes: http://tracker.ceph.com/issues/39287
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit f97be8cb6e025442607042d9defc01542049d472)

Conflicts:
src/rgw/rgw_period_pusher.cc
- mimic has store where master has store->svc.zone (in the argument list)

src/rgw/rgw_period_pusher.cc

index ec676c239437624b2c4f8b18a66996a7a26f6e3f..c5f2fbefef54fc441fd552000ef2e0930ecbabcb 100644 (file)
@@ -245,7 +245,7 @@ void RGWPeriodPusher::handle_notify(RGWZonesNeedPeriod&& period)
       hint = conns.emplace_hint(
           hint, std::piecewise_construct,
           std::forward_as_tuple(zonegroup.get_id()),
-          std::forward_as_tuple(cct, store, zonegroup.get_id(), zonegroup.endpoints, RGWAccessKey()));
+          std::forward_as_tuple(cct, store, zonegroup.get_id(), zonegroup.endpoints));
     }
   }