From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 11 Jan 2018 02:39:28 +0000 (-0500)
Subject: config: lower default omap entries recovered at once
X-Git-Tag: v12.2.3~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19928%2Fhead;p=ceph.git

config: lower default omap entries recovered at once

For large omap DBs, reading 64k leads to heartbeat timeouts.  There
are numerous callchains leading to this recovery step, many of which
do not have heartbeat handles, so for an easily backported version
just change the default number of entries read. DBs approaching 100GB
may require an even lower setting, but this should be good enough for
most clusters, without sacrificing recovery speed.

Fixes: http://tracker.ceph.com/issues/21897
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 72c2076f2c14778982fb944ffade3f071a727d1a)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 33f920525888..2b75f7c434be 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2409,7 +2409,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("osd_recovery_max_omap_entries_per_chunk", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(64000)
+    .set_default(8096)
     .set_description(""),
 
     Option("osd_copyfrom_max_chunk", Option::TYPE_UINT, Option::LEVEL_ADVANCED)