Merge pull request #9935 from xiexingguo/xxg-wip-make-zone-configurable

os/bluestore: fix memory leak during bit_alloc testing Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
ceph · Jun 30, 2016 · 0ab6480 · 0ab6480
2 parents f2c2c29 + f35b05b
commit 0ab6480
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/os/bluestore/BitMapAllocator.cc b/src/os/bluestore/BitMapAllocator.cc
@@ -30,7 +30,7 @@ BitMapAllocator::BitMapAllocator(int64_t device_size, int64_t block_size)
         zone_size_blks, CONCURRENT, true);
   assert(m_bit_alloc);
   if (!m_bit_alloc) {
-    dout(10) << __func__ << "Unable to intialize Bit Allocator" << dendl;
+    derr << __func__ << " Unable to intialize Bit Allocator" << dendl;
   }
   dout(10) << __func__ << " instance " << (uint64_t) this
            << " size 0x" << std::hex << device_size << std::dec

diff --git a/src/test/objectstore/BitAllocator_test.cc b/src/test/objectstore/BitAllocator_test.cc
@@ -84,7 +84,6 @@ TEST(BitAllocator, test_bmap_iter)
   bmap_test_assert(count == num_items + 1);
 
   delete arr;
-  //delete list;
 
   num_items = 4;
   off = num_items - 1;
@@ -93,7 +92,6 @@ TEST(BitAllocator, test_bmap_iter)
   for (i = 0; i < num_items; i++) {
     (*arr)[i].init(i);
   }
-//  list = new BitMapList<BmapEntityTmp>(arr, num_items, 0);
   iter = BitMapEntityIter<BmapEntityTmp>(arr, off, true);
   i = off;
   last_idx = off;
@@ -109,6 +107,8 @@ TEST(BitAllocator, test_bmap_iter)
   bmap_test_assert(i == (off + 1)%num_items);
   bmap_test_assert(count == num_items + 1);
 
+  delete arr;
+
   /*
    * BitMapArea Iter tests.
    */
@@ -136,7 +136,6 @@ TEST(BitAllocator, test_bmap_iter)
   bmap_test_assert(i == off);
   bmap_test_assert(count == num_items);
 
-  // offset 0
   off = 0;
   area_iter = BmapEntityListIter(area_list, off, true);
   i = off;
@@ -152,6 +151,12 @@ TEST(BitAllocator, test_bmap_iter)
   }
   bmap_test_assert(i == (off + 1)%num_items);
   bmap_test_assert(count == num_items + 1);
+
+  for (i = 0; i < num_items; i++)
+    delete children[i];
+
+  delete children;
+  delete area_list;
 }
 
 TEST(BitAllocator, test_bmap_entry)
@@ -232,6 +237,7 @@ TEST(BitAllocator, test_bmap_entry)
   bmap_test_assert(!bmap->is_allocated(0, 4));
   bmap->set_bits(0, 4);
   bmap_test_assert(bmap->is_allocated(0, BmapEntry::size()));
+  delete bmap;
 }
 
 TEST(BitAllocator, test_zone_alloc)
@@ -384,7 +390,6 @@ TEST(BitAllocator, test_bmap_alloc)
   delete alloc;
   alloc = new BitAllocator(total_blocks, zone_size, CONCURRENT);
 
-  int64_t blocks[2048] = {0};
   for (int64_t i = 0; i < alloc->size(); i++) {
     allocated = alloc->alloc_blocks(1, &start_block);
     bmap_test_assert(allocated == 1);
@@ -393,6 +398,8 @@ TEST(BitAllocator, test_bmap_alloc)
     alloc->free_blocks(i, 1);
   }
 
+  int64_t blocks[alloc->size() / 2];
+  memset(blocks, 0, sizeof(blocks));
   allocated = alloc->alloc_blocks_dis(alloc->size()/2, blocks);
   bmap_test_assert(allocated == alloc->size() / 2);