From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 8 May 2020 22:13:31 +0000 (+0200)
Subject: Revert "os/bluestore: Enable sharding by default"
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1301^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=619fcdddecffe0612c362fb008a19b9a2830949f;p=ceph-ci.git

Revert "os/bluestore: Enable sharding by default"

This reverts commit aa1a116f9eef5d6fbe09d6ed99910223451431f1.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 473a9d014cf..9d7c97af532 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4417,11 +4417,11 @@ std::vector<Option> get_global_options() {
     .set_description("Rocksdb options"),
 
     Option("bluestore_rocksdb_cf", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(true)
+    .set_default(false)
     .set_description("Enable use of rocksdb column families for bluestore metadata"),
 
     Option("bluestore_rocksdb_cfs", Option::TYPE_STR, Option::LEVEL_DEV)
-    .set_default("m(3) O(3,0-13) L")
+    .set_default("m(5) O(7,0-13) L")
     .set_description("Definition of column families and their sharding")
     .set_long_description("Space separated list of elements: column_def [ '=' rocksdb_options ]. "
 			  "column_def := column_name [ '(' shard_count [ ',' hash_begin '-' [ hash_end ] ] ')' ]. "