From owner-svn-src-all@freebsd.org  Wed Dec 23 21:59:39 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0DF6A509A0;
 Wed, 23 Dec 2015 21:59:39 +0000 (UTC)
 (envelope-from lidl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F7AC18AF;
 Wed, 23 Dec 2015 21:59:39 +0000 (UTC)
 (envelope-from lidl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNLxcGG090655;
 Wed, 23 Dec 2015 21:59:38 GMT (envelope-from lidl@FreeBSD.org)
Received: (from lidl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNLxcAv090654;
 Wed, 23 Dec 2015 21:59:38 GMT (envelope-from lidl@FreeBSD.org)
Message-Id: <201512232159.tBNLxcAv090654@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lidl set sender to
 lidl@FreeBSD.org using -f
From: Kurt Lidl <lidl@FreeBSD.org>
Date: Wed, 23 Dec 2015 21:59:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292673 - stable/10/etc/periodic/daily
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 21:59:39 -0000

Author: lidl
Date: Wed Dec 23 21:59:38 2015
New Revision: 292673
URL: https://svnweb.freebsd.org/changeset/base/292673

Log:
  MFC r292313:
  
  Skip unavailable pools when running zfs pool scrubs
  
  Approved by:	rpaulo (mentor)

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

Modified: stable/10/etc/periodic/daily/800.scrub-zfs
==============================================================================
--- stable/10/etc/periodic/daily/800.scrub-zfs	Wed Dec 23 21:57:26 2015	(r292672)
+++ stable/10/etc/periodic/daily/800.scrub-zfs	Wed Dec 23 21:59:38 2015	(r292673)
@@ -43,6 +43,10 @@ case "$daily_scrub_zfs_enable" in
 			rc=3
 			echo "Skipping faulted pool: ${pool}"
 			continue ;;
+		*UNAVAIL*)
+			rc=4
+			echo "Skipping unavailable pool: ${pool}"
+			continue ;;
 		esac
 
 		# determine how many days shall be between scrubs