From 00ed892149b0fc5343decf70100803fdc918837a Mon Sep 17 00:00:00 2001 From: Enming Zhang Date: Wed, 8 Nov 2017 20:38:18 +0800 Subject: [PATCH] rgw: cleanup repeated assignment to need_zone_update in zone modify command Signed-off-by: Enming Zhang --- src/rgw/rgw_admin.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 17146ae2d36..61220f36a76 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -4139,13 +4139,17 @@ int main(int argc, const char **argv) need_zone_update = true; } - for (auto add : tier_config_add) { - zone.tier_config[add.first] = add.second; + if (tier_config_add.size() > 0) { + for (auto add : tier_config_add) { + zone.tier_config[add.first] = add.second; + } need_zone_update = true; } - for (auto rm : tier_config_rm) { - zone.tier_config.erase(rm.first); + if (tier_config_rm.size() > 0) { + for (auto rm : tier_config_rm) { + zone.tier_config.erase(rm.first); + } need_zone_update = true; } -- 2.47.3