From owner-svn-src-stable-8@FreeBSD.ORG  Wed Jun  8 11:36:06 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E062A106567B;
	Wed,  8 Jun 2011 11:36:06 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF6D28FC14;
	Wed,  8 Jun 2011 11:36:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p58Ba62Z029195;
	Wed, 8 Jun 2011 11:36:06 GMT (envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p58Ba68D029193;
	Wed, 8 Jun 2011 11:36:06 GMT (envelope-from netchild@svn.freebsd.org)
Message-Id: <201106081136.p58Ba68D029193@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Wed, 8 Jun 2011 11:36:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222857 - stable/8/etc/periodic/daily
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2011 11:36:07 -0000

Author: netchild
Date: Wed Jun  8 11:36:06 2011
New Revision: 222857
URL: http://svn.freebsd.org/changeset/base/222857

Log:
  MFC r221430:
    Use proper return codes (valuable output, invalid config, problems).

Modified:
  stable/8/etc/periodic/daily/800.scrub-zfs
Directory Properties:
  stable/8/etc/periodic/   (props changed)

Modified: stable/8/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- stable/8/etc/periodic/daily/800.scrub-zfs	Wed Jun  8 10:59:36 2011	(r222856)
+++ stable/8/etc/periodic/daily/800.scrub-zfs	Wed Jun  8 11:36:06 2011	(r222857)
@@ -26,10 +26,12 @@ case "$daily_scrub_zfs_enable" in
 		daily_scrub_zfs_pools="$(zpool list -H -o name)"
 	fi
 
+	rc=0
 	for pool in ${daily_scrub_zfs_pools}; do
 		# sanity check
 		_status=$(zpool list "${pool}" 2> /dev/null)
 		if [ $? -ne 0 ]; then
+			rc=2
 			echo "   WARNING: pool '${pool}' specified in"
 			echo "            '/etc/periodic.conf:daily_scrub_zfs_pools'"
 			echo "            does not exist"
@@ -38,13 +40,11 @@ case "$daily_scrub_zfs_enable" in
 		_status=${_status##*$newline}
 		case ${_status} in
 		*FAULTED*)
+			rc=3
 			echo "Skipping faulted pool: ${pool}"
 			continue ;;
 		esac
 
-		# 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
@@ -77,10 +77,12 @@ case "$daily_scrub_zfs_enable" in
 			*"none requested"*)
 				echo "   starting first scrub (since reboot) of pool '${pool}':"
 				zpool scrub ${pool}
+				[ $rc -eq 0 ] && rc=1
 				;;
 			*)
 				echo "   starting scrub of pool '${pool}':"
 				zpool scrub ${pool}
+				[ $rc -eq 0 ] && rc=1
 				;;
 		esac