From 8c1f7ebd3ff82c3ac3935620fead123734075a85 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Thu, 3 Mar 2016 14:20:31 +0100 Subject: [PATCH] rgw: RGWZoneParams::create should not handle -EEXIST error It should be handled by the caller Signed-off-by: Orit Wasserman --- src/rgw/rgw_rados.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 7cd7acbc00861..67ada849518cf 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1505,18 +1505,12 @@ int RGWZoneParams::create(bool exclusive) } r = RGWSystemMetaObj::create(exclusive); - if (r < 0 && r != -EEXIST) { - derr << "RGWZoneParams::creat(): error creating default zone params: " << cpp_strerror(-r) << dendl; + if (r < 0) { + ldout(cct, 0) << "RGWZoneParams::create(): error creating default zone params: " << cpp_strerror(-r) << dendl; return r; } - if (r == -EEXIST) { - ldout(cct, 0) << "RGWZoneParams::create() returned -EEXIST, we raced with another zone params creation" << dendl; - r = read_info(id); - if (r < 0) { - return r; - } - } else if (zones.empty()) { /* first zone? maybe, it's a racy check */ + if (zones.empty()) { /* first zone? maybe, it's a racy check */ r = set_as_default(); if (r < 0) { ldout(cct, 0) << "WARNING: failed to set zone as default, r=" << r << dendl; @@ -3575,6 +3569,7 @@ int RGWRados::init_complete() ldout(cct, 10) << "Cannot find current period zone using local zone" << dendl; if (creating_defaults && cct->_conf->rgw_zone.empty()) { + ldout(cct, 10) << " Using default name "<< default_zone_name << dendl; zone_params.set_name(default_zone_name); } -- 2.39.5