Merge pull request #452 from BjoernT/bug/451

Adding osd_scrub_begin_hour and osd_scrub_end_hour
pull/456/head
Leseb 2015-12-09 17:26:38 +01:00
commit 45bb26649e
3 changed files with 14 additions and 0 deletions

View File

@ -167,6 +167,11 @@ dummy:
#filestore_op_threads: 8 #filestore_op_threads: 8
#filestore_max_sync_interval: 5 #filestore_max_sync_interval: 5
#osd_max_scrubs: 1 #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 # Recovery tuning
#osd_recovery_max_active: 5 #osd_recovery_max_active: 5

View File

@ -176,6 +176,11 @@ osd_op_threads: 8
filestore_op_threads: 8 filestore_op_threads: 8
filestore_max_sync_interval: 5 filestore_max_sync_interval: 5
osd_max_scrubs: 1 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 # Recovery tuning
osd_recovery_max_active: 5 osd_recovery_max_active: 5

View File

@ -115,6 +115,10 @@
filestore op threads = {{ filestore_op_threads }} filestore op threads = {{ filestore_op_threads }}
filestore max sync interval = {{ filestore_max_sync_interval }} filestore max sync interval = {{ filestore_max_sync_interval }}
osd max scrubs = {{ osd_max_scrubs }} 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 # Recovery tuning
osd recovery max active = {{ osd_recovery_max_active }} osd recovery max active = {{ osd_recovery_max_active }}
osd max backfills = {{ osd_max_backfills }} osd max backfills = {{ osd_max_backfills }}