From owner-svn-src-stable-8@FreeBSD.ORG Sun Dec 19 00:42:59 2010 Return-Path: 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 4EFA2106566C for ; Sun, 19 Dec 2010 00:42:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx23.fluidhosting.com [204.14.89.6]) by mx1.freebsd.org (Postfix) with ESMTP id ECAC98FC15 for ; Sun, 19 Dec 2010 00:42:58 +0000 (UTC) Received: (qmail 17955 invoked by uid 399); 19 Dec 2010 00:16:18 -0000 Received: from localhost (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 19 Dec 2010 00:16:18 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4D0D4ED0.2050903@FreeBSD.org> Date: Sat, 18 Dec 2010 16:16:16 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20101210 Thunderbird/3.1.7 MIME-Version: 1.0 To: Alexander Leidinger References: <201008191324.o7JDOEtY005222@svn.freebsd.org> In-Reply-To: <201008191324.o7JDOEtY005222@svn.freebsd.org> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r211506 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2010 00:42:59 -0000 This should not have been done. It added a bunch of extraneous mergeinfo in the RELENG_8 etc branch. This change was important, but not so important that it didn't warrant asking for help to get the merge right. Doug On 08/19/2010 06:24, Alexander Leidinger wrote: > Author: netchild > Date: Thu Aug 19 13:24:13 2010 > New Revision: 211506 > URL: http://svn.freebsd.org/changeset/base/211506 > > Log: > sort of MFC: r211495 was supposed to add this script from HEAD, and while > the merge seems to have been successful, the script does not show up > in releng-8. This is a "svn copy head/.../800.zfs-scrub ." as retrying > the svn merge does not result in the file showing up. This may not be > the best way to fix the problem in svn, but it is the only way I'm aware of > to fix the stable branch (which is IMO more important than to use a potential > best way I'm not aware of). > > Relevant commit log for this file (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 > > Added: > - copied unchanged from r211505, head/etc/periodic/daily/800.scrub-zfs > Directory Properties: > stable/8/etc/periodic/daily/800.scrub-zfs (props changed) > > Copied: stable/8/etc/periodic/daily/800.scrub-zfs (from r211505, head/etc/periodic/daily/800.scrub-zfs) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ stable/8/etc/periodic/daily/800.scrub-zfs Thu Aug 19 13:24:13 2010 (r211506, copy of r211505, head/etc/periodic/daily/800.scrub-zfs) > @@ -0,0 +1,86 @@ > +#!/bin/sh > +# > +# $FreeBSD$ > +# > + > +# 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 > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/