From 60ecef0c8a8209d8928158dd928a5ee301860d09 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 12 Oct 2021 12:45:29 -0400 Subject: [PATCH] rgw: enable RGWReshard thread on any zone that supports it enable the background dynamic resharding thread based on RGWSI_Zone::can_reshard(), which takes the zonegroup features into account Fixes: https://tracker.ceph.com/issues/52877 Signed-off-by: Casey Bodley --- src/rgw/rgw_rados.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 7e27c1e67f5..5623f589242 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1337,8 +1337,9 @@ int RGWRados::init_complete(const DoutPrefixProvider *dpp) reshard = new RGWReshard(this->store); - /* only the master zone in the zonegroup reshards buckets */ - run_reshard_thread = run_reshard_thread && (zonegroup.master_zone == zone.id); + // disable reshard thread based on zone/zonegroup support + run_reshard_thread = run_reshard_thread && svc.zone->can_reshard(); + if (run_reshard_thread) { reshard->start_processor(); } -- 2.39.5