From e9a6dec55b894b34e3278dbf6b226063fd461cd5 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Sun, 22 Jan 2017 15:05:30 +0200 Subject: [PATCH] rgw: add check for update return value Signed-off-by: Orit Wasserman (cherry picked from commit 125955e0625461065dc4755b900e51c3598cadb4) --- src/rgw/rgw_rados.cc | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 9225613fa94ea..424b80831ba35 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3615,7 +3615,11 @@ int RGWRados::init_zg_from_period(bool *initialized) master->second.name << " id:" << master->second.id << " as master" << dendl; if (zonegroup.get_id() == zg.get_id()) { zonegroup.master_zone = master->second.id; - zonegroup.update(); + ret = zonegroup.update(); + if (ret < 0) { + ldout(cct, 0) << "error updating zonegroup : " << cpp_strerror(-ret) << dendl; + return ret; + } } else { RGWZoneGroup fixed_zg(zg.get_id(),zg.get_name()); ret = fixed_zg.init(cct, this); @@ -3624,7 +3628,11 @@ int RGWRados::init_zg_from_period(bool *initialized) return ret; } fixed_zg.master_zone = master->second.id; - fixed_zg.update(); + ret = fixed_zg.update(); + if (ret < 0) { + ldout(cct, 0) << "error initializing zonegroup : " << cpp_strerror(-ret) << dendl; + return ret; + } } } else { ldout(cct, 0) << "zonegroup " << zg.get_name() << " missing zone for master_zone=" << @@ -3678,7 +3686,11 @@ int RGWRados::init_zg_from_local(bool *creating_defaults) ldout(cct, 0) << "zonegroup " << zonegroup.get_name() << " missing master_zone, setting zone " << master->second.name << " id:" << master->second.id << " as master" << dendl; zonegroup.master_zone = master->second.id; - zonegroup.update(); + ret = zonegroup.update(); + if (ret < 0) { + ldout(cct, 0) << "error initializing zonegroup : " << cpp_strerror(-ret) << dendl; + return ret; + } } else { ldout(cct, 0) << "zonegroup " << zonegroup.get_name() << " missing zone for " "master_zone=" << zonegroup.master_zone << dendl; -- 2.39.5