rgw: don't prevent overriding explicit placement changes in metadata set

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
yehudasa · Feb 14, 2018 · 0baebec · 0baebec
1 parent a829cd4
commit 0baebec
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
@@ -2308,9 +2308,11 @@ class RGWBucketInstanceMetadataHandler : public RGWMetadataHandler {
       }
       bci.info.index_type = rule_info.index_type;
     } else {
-      /* existing bucket, keep its placement */
-      bci.info.bucket.explicit_placement = old_bci.info.bucket.explicit_placement;
-      bci.info.placement_rule = old_bci.info.placement_rule;
+      if (bci.info.bucket.explicit_placement.index_pool.empty()) {
+        /* existing bucket, keep its placement -- unless explicit placement is set */
+        bci.info.bucket.explicit_placement = old_bci.info.bucket.explicit_placement;
+        bci.info.placement_rule = old_bci.info.placement_rule;
+      }
     }
 
     if (exists && old_bci.info.datasync_flag_enabled() != bci.info.datasync_flag_enabled()) {