Adding osd_scrub_begin_hour and osd_scrub_end_hour to limit scrub window of 24h if...

Fixes-Bug: #451

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 2ae0da87659f0c368824fb868d579f2d42058af7..ffc758e032ecc438ea3501a0893cf29010aeb8ce 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -167,6 +167,11 @@ dummy:
 #filestore_op_threads: 8
 #filestore_max_sync_interval: 5
 #osd_max_scrubs: 1
+# The OSD scrub window can be configured starting hammer only!
+# Default settings will define a 24h window for the scrubbing operation
+# The window is predefined from 0am midnight to midnight the next day.
+#osd_scrub_begin_hour: 0
+#osd_scrub_end_hour: 24
 
 # Recovery tuning
 #osd_recovery_max_active: 5

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index cf076897eb99b552671cbbe13ba26a9839228e08..2628527879e805758018653a63041b894ec12c25 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -176,6 +176,11 @@ osd_op_threads: 8
 filestore_op_threads: 8\r
 filestore_max_sync_interval: 5\r
 osd_max_scrubs: 1\r
+# The OSD scrub window can be configured starting hammer only!\r
+# Default settings will define a 24h window for the scrubbing operation\r
+# The window is predefined from 0am midnight to midnight the next day.\r
+osd_scrub_begin_hour: 0\r
+osd_scrub_end_hour: 24\r
 \r
 # Recovery tuning\r
 osd_recovery_max_active: 5\r

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index be8d1a40b56a95390d4f21f5167cfcd1e5198008..d9426ea45ebcd544bea51d7181734dfdeb277b2b 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -115,6 +115,10 @@
   filestore op threads = {{ filestore_op_threads }}
   filestore max sync interval = {{ filestore_max_sync_interval }}
   osd max scrubs = {{ osd_max_scrubs }}
+{% if ceph_stable_release not in ['argonaut','bobtail','cuttlefish','dumpling','emperor','firefly','giant'] %}
+  osd scrub begin hour = {{ osd_scrub_begin_hour }}
+  osd scrub end hour = {{ osd_scrub_end_hour }}
+{% endif %}
   # Recovery tuning
   osd recovery max active = {{ osd_recovery_max_active }}
   osd max backfills = {{ osd_max_backfills }}