From cdcfab35dc2fea654232701b159e378bb6e7dd3a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Jul 2017 15:33:55 -0400 Subject: [PATCH] crush/CrushWrapper: detach_bucket: weight down weight_sets Signed-off-by: Sage Weil --- src/crush/CrushWrapper.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index b8cfc449aae..3d2ae916ea9 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -999,6 +999,11 @@ int CrushWrapper::detach_bucket(CephContext *cct, int item) // zero out the bucket weight bucket_adjust_item_weight(cct, parent_bucket, item, 0); adjust_item_weight(cct, parent_bucket->id, parent_bucket->weight); + for (auto& p : choose_args) { + // weight down each weight-set to 0 before we remove the item + vector weightv(get_choose_args_positions(p.second), 0); + choose_args_adjust_item_weight(cct, p.second, item, weightv, nullptr); + } // remove the bucket from the parent bucket_remove_item(parent_bucket, item); -- 2.39.5