From a0420741d446341a4979d78db7e2e58f396fdc4b Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Fri, 8 Jul 2016 10:41:59 +0200 Subject: [PATCH] rgw: add missing master_zone when running with old default region config Fixes: http://tracker.ceph.com/issues/16627 Signed-off-by: Orit Wasserman --- src/rgw/rgw_rados.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 9e072479cd6bd..61db69b81d6ba 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3355,6 +3355,17 @@ int RGWRados::replace_region_with_zonegroup() zoneparams.metadata_heap = ".rgw.meta"; return zoneparams.update(); } + /* update master zone */ + RGWZoneGroup default_zg(default_zonegroup_name); + ret = default_zg.init(cct, this); + if (ret < 0 && ret != -ENOENT) { + ldout(cct, 0) << __func__ << ": error in initializing default zonegroup: " << cpp_strerror(-ret) << dendl; + return ret; + } + if (ret != -ENOENT && default_zg.master_zone.empty()) { + default_zg.master_zone = zoneparams.get_id(); + return default_zg.update(); + } return 0; } -- 2.39.5