From 57e66c6f2d313a22fa5fb5bdd06cdcc5eaaff2ea Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 27 Feb 2017 11:54:39 +0100 Subject: [PATCH] crush: clear bucket class ids when removed Refs: http://tracker.ceph.com/issues/18943 Signed-off-by: Loic Dachary --- src/crush/CrushWrapper.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index 45c41596016d..35c320f2757d 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -248,6 +248,8 @@ bool CrushWrapper::_maybe_remove_last_instance(CephContext *cct, int item, bool crush_bucket *t = get_bucket(item); ldout(cct, 5) << "_maybe_remove_last_instance removing bucket " << item << dendl; crush_remove_bucket(crush, t); + if (class_bucket.count(item) != 0) + class_bucket.erase(item); } if ((item >= 0 || !unlink_only) && name_map.count(item)) { ldout(cct, 5) << "_maybe_remove_last_instance removing name for item " << item << dendl; -- 2.47.3