From 7490e8dc8081a62fdf0aa99f0fa49c2837159db1 Mon Sep 17 00:00:00 2001 From: delphij Date: Tue, 3 Jan 2012 10:22:09 +0000 Subject: [PATCH 27/65] MFC r226471 (se): Add missing default values for daily/800.scrub-zfs for documentation purposes. No functional change, since all parameters are set to their default values. MFC r226865 (delphij): Increase default scrub threshold from 30 days to 5 weeks. Using whole weeks makes it easier to predicate when the scrub would happen. Requested by: gjb git-svn-id: http://svn.freebsd.org/base/stable/9@229381 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit a9040ae1cb1ece74d1ce4b35539b3f91a548127f) Signed-off-by: Xin Li --- etc/defaults/periodic.conf | 6 ++++++ etc/periodic/daily/800.scrub-zfs | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf index f6c42df47..27192bc 100644 --- a/etc/defaults/periodic.conf +++ b/etc/defaults/periodic.conf @@ -147,6 +147,12 @@ daily_status_pkg_changes_enable="NO" # Show package changes daily_queuerun_enable="YES" # Run mail queue daily_submit_queuerun="YES" # Also submit queue +# 800.scrub-zfs +daily_scrub_zfs_enable="NO" +daily_scrub_zfs_pools="" # empty string selects all pools +daily_scrub_zfs_default_threshold="35" # days between scrubs +#daily_scrub_zfs_${poolname}_threshold="35" # pool specific threshold + # 999.local daily_local="/etc/daily.local" # Local scripts diff --git a/etc/periodic/daily/800.scrub-zfs b/etc/periodic/daily/800.scrub-zfs index b153b66..ee0e52a 100755 --- a/etc/periodic/daily/800.scrub-zfs +++ b/etc/periodic/daily/800.scrub-zfs @@ -15,7 +15,7 @@ then source_periodic_confs fi -: ${daily_scrub_zfs_default_threshold=30} +: ${daily_scrub_zfs_default_threshold=35} case "$daily_scrub_zfs_enable" in [Yy][Ee][Ss]) -- 1.7.8.3