From 46ded6eb5b099db783e6ff4a1baa44eb1300e9c3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 12 Aug 2017 15:19:45 -0400 Subject: [PATCH] crush/CrushWrapper: fixing timing of removal in remove_item_under Do it after we reweight, not before Signed-off-by: Sage Weil --- src/crush/CrushWrapper.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index e91f24b0267..76c6afe60a5 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -510,13 +510,13 @@ int CrushWrapper::_remove_item_under( if (id == item) { ldout(cct, 5) << "_remove_item_under removing item " << item << " from bucket " << b->id << dendl; - bucket_remove_item(b, item); 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_in_bucket( cct, p.second, b->id, item, weightv, nullptr); } + bucket_remove_item(b, item); adjust_item_weight(cct, b->id, b->weight); ret = 0; } else if (id < 0) { -- 2.39.5