From dd50c146d69b535217fcf73ab04a7682989ed9ff Mon Sep 17 00:00:00 2001 From: Tianshan Qu Date: Tue, 22 Nov 2016 18:53:05 +0800 Subject: [PATCH] rgw: fix zone did't update realm_id when added to zonegroup Fixes: http://tracker.ceph.com/issues/17995 Signed-off-by: Tianshan Qu --- src/rgw/rgw_admin.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index ab0b94d805bd6..2b2f8ffa287ab 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -3135,6 +3135,15 @@ int main(int argc, char **argv) cerr << "unable to initialize zone: " << cpp_strerror(-ret) << std::endl; return -ret; } + if (zone.realm_id != zonegroup.realm_id) { + zone.realm_id = zonegroup.realm_id; + ret = zone.update(); + if (ret < 0) { + cerr << "failed to save zone info: " << cpp_strerror(-ret) << std::endl; + return -ret; + } + } + string *ptier_type = (tier_type_specified ? &tier_type : nullptr); zone.tier_config = tier_config_add; -- 2.39.5