crush/CrushWrapper: remove_item: weight down weight-sets

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 980df214a555af71131f021e8a703a2c8450b8ca..c3e1c50e364229b3e711d6c3419ce0f8304cfb25 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -438,6 +438,11 @@ int CrushWrapper::remove_item(CephContext *cct, int item, bool unlink_only)
       if (id == item) {
        ldout(cct, 5) << "remove_item removing item " << item
                      << " from bucket " << b->id << dendl;
+       for (auto& p : choose_args) {
+         // weight down each weight-set to 0 before we remove the item
+         vector<int> weightv(get_choose_args_positions(p.second), 0);
+         choose_args_adjust_item_weight(cct, p.second, item, weightv, nullptr);
+       }
        bucket_remove_item(b, item);
        adjust_item_weight(cct, b->id, b->weight);
        ret = 0;