From: Enming Zhang <enming.zhang@umcloud.com>
Date: Wed, 8 Nov 2017 12:38:18 +0000 (+0800)
Subject: rgw: cleanup repeated assignment to need_zone_update in zone modify command
X-Git-Tag: v13.0.1~257^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=00ed892149b0fc5343decf70100803fdc918837a;p=ceph-ci.git

rgw: cleanup repeated assignment to need_zone_update in zone modify command

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
---

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;
         }