From: Ramesh Chander <Ramesh.Chander@sandisk.com>
Date: Mon, 16 May 2016 21:30:05 +0000 (-0400)
Subject: os/bluestore: add config for allocator
X-Git-Tag: v11.0.0~537^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3d3c512e972ffc0fc2ea126dd88521dc68d37e7;p=ceph.git

os/bluestore: add config for allocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index c7dba32cd323..67d729ce3370 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -947,6 +947,7 @@ OPTION(bluestore_min_alloc_size, OPT_U32, 64*1024)
 OPTION(bluestore_onode_map_size, OPT_U32, 1024)   // onodes per collection
 OPTION(bluestore_cache_tails, OPT_BOOL, true)   // cache tail blocks in Onode
 OPTION(bluestore_kvbackend, OPT_STR, "rocksdb")
+OPTION(bluestore_allocator, OPT_STR, "stupid")  // or "bitmap"
 OPTION(bluestore_freelist_type, OPT_STR, "bitmap")
 OPTION(bluestore_freelist_blocks_per_key, OPT_INT, 128)
 OPTION(bluestore_rocksdb_options, OPT_STR, "compression=kNoCompression,max_write_buffer_number=16,min_write_buffer_number_to_merge=3,recycle_log_file_num=16")
diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 0e952776a9fe..c8d7f72e006c 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -280,7 +280,7 @@ void BlueFS::_init_alloc()
   for (unsigned id = 0; id < bdev.size(); ++id) {
     if (!bdev[id])
       continue;
-    alloc[id] = Allocator::create("stupid");
+    alloc[id] = Allocator::create(g_conf->bluestore_allocator);
     interval_set<uint64_t>& p = block_all[id];
     for (interval_set<uint64_t>::iterator q = p.begin(); q != p.end(); ++q) {
       alloc[id]->init_add_free(q.get_start(), q.get_len());
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 8d967735bb5e..49c0500bae09 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1044,7 +1044,7 @@ void BlueStore::_close_fm()
 int BlueStore::_open_alloc()
 {
   assert(alloc == NULL);
-  alloc = Allocator::create("stupid");
+  alloc = Allocator::create(g_conf->bluestore_allocator);
   uint64_t num = 0, bytes = 0;
   fm->enumerate_reset();
   uint64_t offset, length;