From c381037d3cb1213c5b5ffd7b6b6704cadcab8484 Mon Sep 17 00:00:00 2001
From: Igor Fedotov <ifedotov@suse.com>
Date: Fri, 14 Feb 2020 17:26:17 +0300
Subject: [PATCH] os/bluestore: configure hybrid allocator threshold to
 fallback.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit b682d9a8e8d3f41d55ad10d2fb3deca8edf8540a)

 Conflicts:
	src/common/options.cc
 trivial
---
 src/common/options.cc                         | 4 ++++
 src/os/bluestore/Allocator.cc                 | 4 +++-
 src/os/bluestore/AvlAllocator.cc              | 4 ++--
 src/os/bluestore/AvlAllocator.h               | 2 +-
 src/os/bluestore/HybridAllocator.h            | 4 ++--
 src/test/objectstore/hybrid_allocator_test.cc | 3 ++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index f3b91c73bb110..c861f8241bc96 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4968,6 +4968,10 @@ std::vector<Option> get_global_options() {
     .set_default(4)
     .set_description(""),
 
+    Option("bluestore_hybrid_alloc_mem_cap", Option::TYPE_UINT, Option::LEVEL_DEV)
+    .set_default(64_M)
+    .set_description("Maximum RAM hybrid allocator should use before enabling bitmap supplement"),
+
     // -----------------------------------------
     // kstore
 
diff --git a/src/os/bluestore/Allocator.cc b/src/os/bluestore/Allocator.cc
index 8a638bdf81a37..0ac9a15a7419e 100644
--- a/src/os/bluestore/Allocator.cc
+++ b/src/os/bluestore/Allocator.cc
@@ -130,7 +130,9 @@ Allocator *Allocator::create(CephContext* cct, string type,
   } else if (type == "avl") {
     return new AvlAllocator(cct, size, block_size, name);
   } else if (type == "hybrid") {
-    return new HybridAllocator(cct, size, block_size, 1024 /*FIXME*/, name);
+    return new HybridAllocator(cct, size, block_size,
+      cct->_conf.get_val<uint64_t>("bluestore_hybrid_alloc_mem_cap"),
+      name);
   }
   if (alloc == nullptr) {
     lderr(cct) << "Allocator::" << __func__ << " unknown alloc type "
diff --git a/src/os/bluestore/AvlAllocator.cc b/src/os/bluestore/AvlAllocator.cc
index 4e2d0915f21d0..e9d0510798626 100755
--- a/src/os/bluestore/AvlAllocator.cc
+++ b/src/os/bluestore/AvlAllocator.cc
@@ -287,7 +287,7 @@ void AvlAllocator::_shutdown()
 AvlAllocator::AvlAllocator(CephContext* cct,
                            int64_t device_size,
                            int64_t block_size,
-                           uint64_t max_entries,
+                           uint64_t max_mem,
                            const std::string& name) :
   Allocator(name),
   num_total(device_size),
@@ -296,7 +296,7 @@ AvlAllocator::AvlAllocator(CephContext* cct,
     cct->_conf.get_val<uint64_t>("bluestore_avl_alloc_bf_threshold")),
   range_size_alloc_free_pct(
     cct->_conf.get_val<uint64_t>("bluestore_avl_alloc_bf_free_pct")),
-  range_count_cap(max_entries),
+  range_count_cap(max_mem / sizeof(range_seg_t)),
   cct(cct)
 {}
 
diff --git a/src/os/bluestore/AvlAllocator.h b/src/os/bluestore/AvlAllocator.h
index 770d7e6459538..b49957a28f908 100755
--- a/src/os/bluestore/AvlAllocator.h
+++ b/src/os/bluestore/AvlAllocator.h
@@ -64,7 +64,7 @@ protected:
   * (when entry count >= max_entries)
   */
   AvlAllocator(CephContext* cct, int64_t device_size, int64_t block_size,
-    uint64_t max_entries,
+    uint64_t max_mem,
     const std::string& name);
 
 public:
diff --git a/src/os/bluestore/HybridAllocator.h b/src/os/bluestore/HybridAllocator.h
index 1c821f69c3b88..7eadad03401fb 100644
--- a/src/os/bluestore/HybridAllocator.h
+++ b/src/os/bluestore/HybridAllocator.h
@@ -12,9 +12,9 @@ class HybridAllocator : public AvlAllocator {
   BitmapAllocator* bmap_alloc = nullptr;
 public:
   HybridAllocator(CephContext* cct, int64_t device_size, int64_t _block_size,
-                  uint64_t max_entries,
+                  uint64_t max_mem,
 	          const std::string& name) :
-      AvlAllocator(cct, device_size, _block_size, max_entries, name) {
+      AvlAllocator(cct, device_size, _block_size, max_mem, name) {
   }
   int64_t allocate(
     uint64_t want,
diff --git a/src/test/objectstore/hybrid_allocator_test.cc b/src/test/objectstore/hybrid_allocator_test.cc
index c21957ef88d8d..5643d47d9b798 100755
--- a/src/test/objectstore/hybrid_allocator_test.cc
+++ b/src/test/objectstore/hybrid_allocator_test.cc
@@ -34,7 +34,8 @@ TEST(HybridAllocator, basic)
   {
     uint64_t block_size = 0x1000;
     uint64_t capacity = 0x10000 * _1m; // = 64GB
-    TestHybridAllocator ha(g_ceph_context, capacity, block_size, 4, "test_hybrid_allocator");
+    TestHybridAllocator ha(g_ceph_context, capacity, block_size,
+      4 * sizeof(range_seg_t), "test_hybrid_allocator");
 
     ASSERT_EQ(0, ha.get_free());
     ASSERT_EQ(0, ha.get_avl_free());
-- 
2.39.5