]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: cleanup repeated assignment to need_zone_update in zone modify command
authorEnming Zhang <enming.zhang@umcloud.com>
Wed, 8 Nov 2017 12:38:18 +0000 (20:38 +0800)
committerEnming Zhang <enming.zhang@umcloud.com>
Wed, 8 Nov 2017 12:38:18 +0000 (20:38 +0800)
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
src/rgw/rgw_admin.cc

index 17146ae2d36b18ba49cb3964a0c9ed8b58534c0e..61220f36a761635d4903bed82860d4ae9f57e414 100644 (file)
@@ -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;
         }