svn commit: r296440 - stable/10/etc/periodic/daily

Alexander Motin mav at FreeBSD.org
Mon Mar 7 08:57:52 UTC 2016


Author: mav
Date: Mon Mar  7 08:57:51 2016
New Revision: 296440
URL: https://svnweb.freebsd.org/changeset/base/296440

Log:
  MFC r295324: Add error check to not leak logs with syntax errors in case
  of failed `zpool history`.

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	Mon Mar  7 07:57:57 2016	(r296439)
+++ stable/10/etc/periodic/daily/800.scrub-zfs	Mon Mar  7 08:57:51 2016	(r296440)
@@ -63,6 +63,11 @@ case "$daily_scrub_zfs_enable" in
 			_last_scrub=$(zpool history ${pool} | \
 			    sed -ne '2s/ .*$//p')
 		fi
+		if [ -z "${_last_scrub}" ]; then
+			echo "   skipping scrubbing of pool '${pool}':"
+			echo "      can't get last scrubbing date"
+			continue
+		fi
 
 		# Now minus last scrub (both in seconds) converted to days.
 		_scrub_diff=$(expr -e \( $(date +%s) - \


More information about the svn-src-stable-10 mailing list