summaryrefslogtreecommitdiffstats
path: root/src/test/crush
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2017-08-04 04:39:05 +0200
committerSage Weil <sage@redhat.com>2017-08-04 04:39:05 +0200
commitc121501ad3e96c3b11954cf641c37e5b8ef53de9 (patch)
treeb0342c6db58608b122d403f5e799058f441e9bb8 /src/test/crush
parentcrush/CrushWrapper: rebuild_roots_with_classes on bucket removal (diff)
downloadceph-c121501ad3e96c3b11954cf641c37e5b8ef53de9.tar.xz
ceph-c121501ad3e96c3b11954cf641c37e5b8ef53de9.zip
crush: remove cleanup_classes()
I can't for the life of me figure out what this is supposed to do. - why remove (some) classes right after we populated them? - why remove them after we decode the crush map? Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/test/crush')
-rw-r--r--src/test/crush/CrushWrapper.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc
index 7929bffc429..4502d0d0e69 100644
--- a/src/test/crush/CrushWrapper.cc
+++ b/src/test/crush/CrushWrapper.cc
@@ -1204,7 +1204,7 @@ TEST(CrushWrapper, split_id_class) {
ASSERT_EQ(-1, retrieved_class_id);
}
-TEST(CrushWrapper, populate_and_cleanup_classes) {
+TEST(CrushWrapper, populate_classes) {
CrushWrapper c;
c.create();
c.set_type_name(1, "root");
@@ -1226,10 +1226,6 @@ TEST(CrushWrapper, populate_and_cleanup_classes) {
old_class_bucket = c.class_bucket;
ASSERT_EQ(c.populate_classes(old_class_bucket), 0);
ASSERT_EQ(old_class_bucket, c.class_bucket);
-
- c.class_bucket.clear();
- ASSERT_EQ(c.cleanup_classes(), 0);
- ASSERT_FALSE(c.name_exists("default~ssd"));
}
TEST(CrushWrapper, remove_class_name) {