From 1c0e32d47605fbe94d01e4155310b28cdbce0029 Mon Sep 17 00:00:00 2001 From: Enming Zhang Date: Mon, 6 Nov 2017 16:38:18 +0800 Subject: [PATCH] rgw: cleanup some unnecessary function called in RGWZoneGroup::add_zone Signed-off-by: Enming Zhang --- src/rgw/rgw_rados.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 452dce2ad10dd..13d3fc91217d7 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -374,18 +374,18 @@ int RGWZoneGroup::add_zone(const RGWZoneParams& zone_params, bool *is_master, bo if (is_master) { if (*is_master) { - if (!master_zone.empty() && master_zone != zone_params.get_id()) { + if (!master_zone.empty() && master_zone != zone_id) { ldout(cct, 0) << "NOTICE: overriding master zone: " << master_zone << dendl; } - master_zone = zone_params.get_id(); - } else if (master_zone == zone_params.get_id()) { + master_zone = zone_id; + } else if (master_zone == zone_id) { master_zone.clear(); } } - RGWZone& zone = zones[zone_params.get_id()]; - zone.name = zone_params.get_name(); - zone.id = zone_params.get_id(); + RGWZone& zone = zones[zone_id]; + zone.name = zone_name; + zone.id = zone_id; if (!endpoints.empty()) { zone.endpoints = endpoints; } -- 2.39.5