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 33f9205258886eab706ab0bacda697d59bed5976..2b75f7c434befb6ba2de5a428cd9cc69cc60c089 100644 (file)
--- 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)