From nobody@FreeBSD.org  Wed Aug  4 12:37:42 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E51AF1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Aug 2010 12:37:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id D314E8FC22
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Aug 2010 12:37:42 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o74Cbgo8014882
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 4 Aug 2010 12:37:42 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o74CbgOR014881;
	Wed, 4 Aug 2010 12:37:42 GMT
	(envelope-from nobody)
Message-Id: <201008041237.o74CbgOR014881@www.freebsd.org>
Date: Wed, 4 Aug 2010 12:37:42 GMT
From: "J. Hellenthal" <jhell@DataIX.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Merge Request for commit r209195 800.scrub-zfs to stable/8
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         149271
>Category:       conf
>Synopsis:       [periodic] merge 800.scrub-zfs to stable/8
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    netchild
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 04 12:40:06 UTC 2010
>Closed-Date:    Thu Aug 19 09:06:02 UTC 2010
>Last-Modified:  Thu Aug 19 09:10:01 UTC 2010
>Originator:     J. Hellenthal
>Release:        stable/8
>Organization:
>Environment:
N/A
>Description:
Please merge commit r209195 800.scrub-zfs to stable/8.

------------------------------------------------------------------------
r209195 | netchild | 2010-06-15 04:58:16 -0400 (Tue, 15 Jun 2010) | 17 lines
Changed paths:
   A /head/etc/periodic/daily/800.scrub-zfs
   M /head/share/man/man5/periodic.conf.5

Add a periodic zfs scrub script.

Features:
 - configurable amount of days between scrubs (default value or per pool)
 - do not scrub directly after pool creation (respects the configured
   number of days between scrubs)
 - do not scrub if a scrub is in progress
 - tells how to see the status of the scrub
 - tells how many days since the last scrub if it skips the scrubbing
 - warns if a non-existent pool is specified explicitely
   (default: no pools specified -> all currently imported pools are
   handled)
 - runs late in the periodic run to not slow down the other periodic daily
   scripts

Discussed on:   fs@

------------------------------------------------------------------------
>How-To-Repeat:
N/A
>Fix:
800.scrub-zfs |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile      |    6 +++-
2 files changed, 91 insertions(+), 1 deletion(-)

Patch attached with submission follows:

Index: etc/periodic/daily/800.scrub-zfs
===================================================================
--- etc/periodic/daily/800.scrub-zfs	(revision 0)
+++ etc/periodic/daily/800.scrub-zfs	(revision 0)
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# $FreeBSD: stable/8/etc/periodic/daily/800.scrub-zfs 209195 2010-06-15 08:58:16Z netchild $
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: ${daily_scrub_zfs_default_threshold=30}
+
+case "$daily_scrub_zfs_enable" in
+    [Yy][Ee][Ss])
+	echo
+	echo 'Scrubbing of zfs pools:'
+
+	if [ -z "${daily_scrub_zfs_pools}" ]; then
+		daily_scrub_zfs_pools="$(zpool list -H -o name)"
+	fi
+
+	for pool in ${daily_scrub_zfs_pools}; do
+		# sanity check
+		zpool list ${pool} >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			echo "   WARNING: pool '${pool}' specified in"
+			echo "            '/etc/periodic.conf:daily_scrub_zfs_pools'"
+			echo "            does not exist"
+			continue
+		fi
+
+		# successful only if there is at least one pool to scrub
+		rc=0
+
+		# determine how many days shall be between scrubs
+		eval _pool_threshold=\${daily_scrub_zfs_${pool}_threshold}
+		if [ -z "${_pool_threshold}" ];then
+			_pool_threshold=${daily_scrub_zfs_default_threshold}
+		fi
+
+		_last_scrub=$(zpool history ${pool} | \
+		    egrep "^[0-9\.\:\-]{19} zpool scrub ${pool}\$" | tail -1 |\
+		    cut -d ' ' -f 1)
+		if [ -z "${_last_scrub}" ]; then
+			# creation time of the pool if no scrub was done
+			_last_scrub=$(zpool history ${pool} | \
+			    sed -ne '2s/ .*$//p')
+		fi
+
+		# Now minus last scrub (both in seconds) converted to days.
+		_scrub_diff=$(expr -e \( $(date +%s) - \
+		    $(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
+		if [ ${_scrub_diff} -le ${_pool_threshold} ]; then
+			echo "   skipping scrubbing of pool '${pool}':"
+			echo "      last scrubbing is ${_scrub_diff} days ago, threshold is set to ${_pool_threshold} days"
+			continue
+		fi
+
+		_status="$(zpool status ${pool} | grep scrub:)"
+		case "${_status}" in
+			*"scrub in progress"*)
+				echo "   scrubbing of pool '${pool}' already in progress, skipping:"
+				;;
+			*"none requested"*)
+				echo "   starting first scrubbing (after reboot) of pool '${pool}':"
+				zpool scrub ${pool}
+				;;
+			*)
+				echo "   starting scrubbing of pool '${pool}':"
+				zpool scrub ${pool}
+				;;
+		esac
+
+		echo "      consult 'zpool status ${pool}' for the result"
+	done
+	;;
+
+    *)
+	rc=0
+	;;
+esac
+
+exit $rc

Property changes on: etc/periodic/daily/800.scrub-zfs
___________________________________________________________________
Added: svn:executable
   + *

Index: etc/periodic/daily/Makefile
===================================================================
--- etc/periodic/daily/Makefile	(revision 210841)
+++ etc/periodic/daily/Makefile	(working copy)
@@ -8,7 +8,6 @@
 	200.backup-passwd \
 	330.news \
 	400.status-disks \
-	404.status-zfs \
 	405.status-ata-raid \
 	406.status-gmirror \
 	407.status-graid3 \
@@ -53,4 +52,9 @@
 	500.queuerun
 .endif
 
+.if ${MK_ZFS} != "no"
+FILES+=	404.status-zfs \
+	800.scrub-zfs
+.endif
+
 .include <bsd.prog.mk>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->netchild 
Responsible-Changed-By: vwe 
Responsible-Changed-When: Mon Aug 9 16:12:51 UTC 2010 
Responsible-Changed-Why:  
Alexander, care about your MFC? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149271 
State-Changed-From-To: open->closed 
State-Changed-By: netchild 
State-Changed-When: Thu Aug 19 09:05:10 UTC 2010 
State-Changed-Why:  
Periodic script MFCed to stable/8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149271 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/149271: commit references a PR
Date: Thu, 19 Aug 2010 09:00:37 +0000 (UTC)

 Author: netchild
 Date: Thu Aug 19 09:00:17 2010
 New Revision: 211495
 URL: http://svn.freebsd.org/changeset/base/211495
 
 Log:
   MFC
   
   r209195:
     Add a periodic zfs scrub script.
   
     Features:
      - configurable amount of days between scrubs (default value or per pool)
      - do not scrub directly after pool creation (respects the configured
        number of days between scrubs)
      - do not scrub if a scrub is in progress
      - tells how to see the status of the scrub
      - tells how many days since the last scrub if it skips the scrubbing
      - warns if a non-existent pool is specified explicitely
        (default: no pools specified -> all currently imported pools are
        handled)
      - runs late in the periodic run to not slow down the other periodic daily
        scripts
   
   r209250:
     - connect the zfs scrub script
     - move the zfs status script into the MK_ZFS conditional to respect
       WITHOUT_ZFS
   
   r209253:
     Add the ZFS periodic daily scripts to the ZFS part. (make delete-old)
   
   Requested by:	"J. Hellenthal" <jhell@DataIX.net>
   PR:		149271
 
 Modified:
   stable/8/etc/periodic/daily/Makefile
   stable/8/share/man/man5/periodic.conf.5
   stable/8/tools/build/mk/OptionalObsoleteFiles.inc
 Directory Properties:
   stable/8/etc/periodic/daily/   (props changed)
   stable/8/share/man/man5/   (props changed)
   stable/8/tools/build/mk/   (props changed)
 
 Modified: stable/8/etc/periodic/daily/Makefile
 ==============================================================================
 --- stable/8/etc/periodic/daily/Makefile	Thu Aug 19 08:50:11 2010	(r211494)
 +++ stable/8/etc/periodic/daily/Makefile	Thu Aug 19 09:00:17 2010	(r211495)
 @@ -8,7 +8,6 @@ FILES=	100.clean-disks \
  	200.backup-passwd \
  	330.news \
  	400.status-disks \
 -	404.status-zfs \
  	405.status-ata-raid \
  	406.status-gmirror \
  	407.status-graid3 \
 @@ -53,4 +52,9 @@ FILES+=	150.clean-hoststat \
  	500.queuerun
  .endif
  
 +.if ${MK_ZFS} != "no"
 +FILES+=	404.status-zfs \
 +	800.scrub-zfs
 +.endif
 +
  .include <bsd.prog.mk>
 
 Modified: stable/8/share/man/man5/periodic.conf.5
 ==============================================================================
 --- stable/8/share/man/man5/periodic.conf.5	Thu Aug 19 08:50:11 2010	(r211494)
 +++ stable/8/share/man/man5/periodic.conf.5	Thu Aug 19 09:00:17 2010	(r211495)
 @@ -25,7 +25,7 @@
  .\"
  .\" $FreeBSD$
  .\"
 -.Dd May 12, 2007
 +.Dd June 15, 2010
  .Dt PERIODIC.CONF 5
  .Os
  .Sh NAME
 @@ -611,6 +611,25 @@ when
  .Va daily_queuerun_enable
  is set to
  .Dq Li YES .
 +.It Va daily_scrub_zfs_enable
 +.Pq Vt bool
 +Set to
 +.Dq Li YES
 +if you want to run a zfs scrub periodically.
 +.It Va daily_scrub_zfs_pools
 +.Pq Vt str
 +A space separated list of names of zfs pools to scrub.
 +If the list is empty or not set, all zfs pools are scrubbed.
 +.It Va daily_scrub_zfs_default_threshold
 +.Pq Vt int
 +Number of days between a scrub if no pool-specific threshold is set.
 +The default value if no value is set is 30.
 +.It Va daily_scrub_zfs_ Ns Ao Ar poolname Ac Ns Va _threshold
 +.Pq Vt int
 +The same as
 +.Va daily_scrub_zfs_default_threshold
 +but specific to the pool
 +.Va Ns Ao Ar poolname Ac Ns .
  .It Va daily_local
  .Pq Vt str
  Set to a list of extra scripts that should be run after all other
 
 Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc
 ==============================================================================
 --- stable/8/tools/build/mk/OptionalObsoleteFiles.inc	Thu Aug 19 08:50:11 2010	(r211494)
 +++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc	Thu Aug 19 09:00:17 2010	(r211495)
 @@ -344,6 +344,8 @@ OLD_FILES+=usr/lib/libuutil.so
  .if ${MK_ZFS} == no
  OLD_LIBS+=lib/libzfs.so.1
  OLD_LIBS+=lib/libzpool.so.1
 +OLD_FILES+=etc/periodic/daily/404.status-zfs
 +OLD_FILES+=etc/periodic/daily/800.scrub-zfs
  OLD_FILES+=sbin/zfs
  OLD_FILES+=sbin/zpool
  OLD_FILES+=usr/lib/libzfs.a
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
