]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
rgw/zone: remove duplicated startup logic in RGWSI_Zone
authorCasey Bodley <cbodley@redhat.com>
Tue, 13 May 2025 13:42:32 +0000 (09:42 -0400)
committerShilpa Jagannath <smanjara@redhat.com>
Mon, 17 Nov 2025 21:22:57 +0000 (16:22 -0500)
commitbfa27a23d76f74c692e703426547a0f875cc2a57
tree2bd71f6e05d4b7e8564a1b63a1b8605dcc02150d
parentd23791621e43b663d648d0595cba2fdcfbdb514d
rgw/zone: remove duplicated startup logic in RGWSI_Zone

SiteConfig had already loaded the correct configuration without all of
the crazy search_realm_with_zone() stuff which is now confused by
defaults. remove all of this duplicated logic and rely on SiteConfig

removes functions search_realm_with_zone() create_default_zg() and
init_default_zone() which are no longer used

Fixes: https://tracker.ceph.com/issues/71291
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 17805489404760c8fa45caa71786058a3984ed0d)
resolves rhbz#2412273

Resolved Conflicts:
src/rgw/services/svc_zone.cc
src/rgw/services/svc_zone.h
src/rgw/driver/rados/rgw_service.cc
src/rgw/driver/rados/rgw_service.h
src/rgw/services/svc_zone.cc
src/rgw/services/svc_zone.h