]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/allocator_replay_test: make allocator type configurable
authorIgor Fedotov <ifed@suse.com>
Mon, 17 May 2021 19:21:53 +0000 (22:21 +0300)
committerNeha Ojha <nojha@redhat.com>
Wed, 2 Jun 2021 16:21:04 +0000 (16:21 +0000)
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f4d1ef9a95e31cb67499ddb265548eda73ab4289)

 Conflicts:
src/test/objectstore/allocator_replay_test.cc - use bmap_allocator_replay_test

src/test/objectstore/bmap_allocator_replay_test.cc

index d6121a1e028e644e0b607245e91728b9ce06bb8f..3547d578de2a17200baeeb764436178a645ba91f 100644 (file)
@@ -137,7 +137,20 @@ int replay_and_check_for_duplicate(char* fname)
       continue;
     }
 
+    string alloc_type = "bitmap";
     sp = strstr(s, "BitmapAllocator");
+    if (!sp) {
+      alloc_type = "avl";
+      sp = strstr(s, "AvlAllocator");
+    }
+    if (!sp) {
+      alloc_type = "hybrid";
+      sp = strstr(s, "HybridAllocator");
+    }
+    if (!sp) {
+      alloc_type = "stupid";
+      sp = strstr(s, "StupidAllocator");
+    }
     if (sp) {
       // 2019-05-30 03:23:43.460 7f889a5edf00 10 fbmap_alloc 0x5642ed36e900 BitmapAllocator 0x15940000000/100000
       if (init_done) { 
@@ -156,7 +169,7 @@ int replay_and_check_for_duplicate(char* fname)
        std::cerr << "error: invalid init: " << s << std::endl;
       return -1;
       }
-      alloc.reset(Allocator::create(g_ceph_context, string("bitmap"), total,
+      alloc.reset(Allocator::create(g_ceph_context, alloc_type, total,
                                    alloc_unit));
 
       init_done = true;