From: Igor Fedotov <ifedotov@suse.com>
Date: Thu, 16 Apr 2020 15:06:04 +0000 (+0300)
Subject: os/bluestore: set hybrid allocator as a default for bluefs/bluestore
X-Git-Tag: v14.2.11~31^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eb9ea2c5b76a0dfeb4c2c4d09de5b701a2a8fdf0;p=ceph.git

os/bluestore: set hybrid allocator as a default for bluefs/bluestore

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

 Conflicts:
	src/test/objectstore/store_test.cc
 trivial
---

diff --git a/src/common/options.cc b/src/common/options.cc
index c861f8241bc96..eb00eb9d26eae 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4363,7 +4363,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("bluefs_allocator", Option::TYPE_STR, Option::LEVEL_DEV)
-    .set_default("bitmap")
+    .set_default("hybrid")
     .set_enum_allowed({"bitmap", "stupid", "avl", "hybrid"})
     .set_description(""),
 
@@ -4719,7 +4719,7 @@ std::vector<Option> get_global_options() {
     .set_description("Key value database to use for bluestore"),
 
     Option("bluestore_allocator", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("bitmap")
+    .set_default("hybrid")
     .set_enum_allowed({"bitmap", "stupid", "avl", "hybrid"})
     .set_description("Allocator policy")
     .set_long_description("Allocator to use for bluestore.  Stupid should only be used for testing."),