Add more recovery options

Recovery and/or re-balancing decrease performance, adding more options
might help tweaking this behavior.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 91e67fa82e7b88bac906b721c66ca74ca473d6c5..41a7ef117a623ae57d36372400bb4fc183148ce2 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -71,6 +71,8 @@ osd_max_scrubs: 1
 osd_recovery_max_active: 5
 osd_max_backfills: 2
 osd_recovery_op_priority: 2
+osd_recovery_max_chunk: 8388608
+osd_recovery_threads: 1
 
 ## MDS options
 #

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index f869e509339eec3fe22663fc7443142f0bfa7269..bb13b85aea33e44a3f4a36d28ebc2626927f9cea 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -90,6 +90,8 @@
   osd recovery max active = {{ osd_recovery_max_active }}
   osd max backfills = {{ osd_max_backfills }}
   osd recovery op priority = {{ osd_recovery_op_priority }}
+  osd recovery max chunk = {{ osd_recovery_max_chunk }}
+  osd recovery threads = {{ osd_recovery_threads }}
   osd objectstore = {{ osd_objectstore }}
   osd crush update on start = {{ osd_crush_update_on_start }}