From 86f2a4d5cf533a5c4d93ab3b99f8be8929a17987 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sat, 13 Apr 2019 11:34:21 -0400 Subject: [PATCH] rgw: RGWPeriodPusher uses zone system key for inter-zonegroup messages 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 (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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_period_pusher.cc b/src/rgw/rgw_period_pusher.cc index ec676c2394376..c5f2fbefef54f 100644 --- a/src/rgw/rgw_period_pusher.cc +++ b/src/rgw/rgw_period_pusher.cc @@ -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)); } } -- 2.39.5