From: Laura Flores <lflores@redhat.com>
Date: Mon, 11 Jul 2022 19:12:24 +0000 (-0500)
Subject: Revert "rocksdb: do not use non-zero recycle_log_file_num setting"
X-Git-Tag: v15.2.17~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=414b68245e6f8e544b126011ed538ff2b8982633;p=ceph.git

Revert "rocksdb: do not use non-zero recycle_log_file_num setting"

This reverts commit 6e225bfbff2c86bf979e124a8808da1969ccab1f. It
causes a consistently-reproducible BlueFS bug. See the tracker
for details.

Fixes: https://tracker.ceph.com/issues/55636
Signed-off-by: Laura Flores <lflores@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index e7ad8ef121dc..024f505cc442 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4497,7 +4497,7 @@ std::vector<Option> get_global_options() {
     .set_description("max duration to force deferred submit"),
 
     Option("bluestore_rocksdb_options", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("compression=kNoCompression,max_write_buffer_number=4,min_write_buffer_number_to_merge=1,write_buffer_size=268435456,writable_file_max_buffer_size=0,compaction_readahead_size=2097152,max_background_compactions=2")
+    .set_default("compression=kNoCompression,max_write_buffer_number=4,min_write_buffer_number_to_merge=1,recycle_log_file_num=4,write_buffer_size=268435456,writable_file_max_buffer_size=0,compaction_readahead_size=2097152,max_background_compactions=2")
     .set_description("Full set of rocksdb settings to override"),
 
     Option("bluestore_rocksdb_options_annex", Option::TYPE_STR, Option::LEVEL_ADVANCED)