From 5393077e07bed45b9fc007591d365f1229d3e815 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Sun, 22 Jan 2017 14:40:16 +0200 Subject: [PATCH] rgw: fix init_zg_from_period when default zone is not set as default Signed-off-by: Orit Wasserman --- src/rgw/rgw_rados.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index ff7f0ad56e6ee..718cdbc6ee86d 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3689,6 +3689,14 @@ int RGWRados::init_zg_from_period(bool *initialized) if (ret < 0 && ret != -ENOENT) { ldout(cct, 0) << "failed reading zone params info: " << " " << cpp_strerror(-ret) << dendl; return ret; + } if (ret ==-ENOENT && zonegroup.get_name() == default_zonegroup_name) { + ldout(cct, 10) << " Using default name "<< default_zone_name << dendl; + zone_params.set_name(default_zone_name); + ret = zone_params.init(cct, this); + if (ret < 0 && ret != -ENOENT) { + ldout(cct, 0) << "failed reading zone params info: " << " " << cpp_strerror(-ret) << dendl; + return ret; + } } } for (iter = current_period.get_map().zonegroups.begin(); -- 2.39.5