From: Alan J. Pippin Date: Thu, 17 Jan 2013 02:26:55 +0000 (-0700) Subject: Fixed bugs related to import/export backup pool feature. X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/%7Blink_visit%7D?a=commitdiff_plain;h=33fdac775c0fe55f73bb79166b33846ac3381bde;p=zfs-ubuntu%2F.git Fixed bugs related to import/export backup pool feature. --- diff --git a/zfs-scrub b/zfs-scrub index c7d6297..4dfdbd3 100755 --- a/zfs-scrub +++ b/zfs-scrub @@ -21,20 +21,26 @@ if [ -z "$pools" ]; then exit 1 fi +fatal_and_exit() { + # echo message to terminal + echo -e 2>&1 "$1" + # send email notification + echo -e "$1" | $mailx -s "zfs scrub on $hostname failed" "$mailto" + exit 1 +} + for i in $pools do # Import the local pool if needed and option was given to do so, else error out zpool list -H "$i" >/dev/null 2>&1 if [ $? != 0 ]; then - if [[ $import_export_backup_pool == 1 ]]; then + if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then zpool import $i if [ $? != 0 ]; then - echo "-E- unable to import the pool $i" - exit 1 + fatal_and_exit "-E- unable to import the pool $i" fi else - echo "-E- The local pool, '$i' doesn't seem to exist." - exit 1 + fatal_and_exit "-E- The local pool, '$i' doesn't seem to exist." fi fi @@ -59,7 +65,7 @@ do # Wait until the scrub completes, and check for any errors while true; do - zpool status $i | grep scan: | grep "in progress" > /dev/null 2>&1 + zpool status $i 2>/dev/null | grep scan: | grep "in progress" > /dev/null 2>&1 if [ $? == 0 ]; then # Our zpool scrub operation is still running # Wait until it is done before continuing @@ -75,23 +81,21 @@ do echo "$date: Scrub completed for zfs pool $i" # Check for any scrub errors + zpool status $i | grep scan: zpool status $i | grep scan: | grep "with 0 errors" > /dev/null 2>&1 if [ $? != 0 ]; then # The scrub found errors - zpool status $i | $mailx -s "zpool scrub $i found errors" $mailto + zpool status $i | $mailx -s "zpool scrub $i found errors" "$mailto" fi # Export the local pool if told to do so - if [[ $import_export_backup_pool == 1 ]]; then + if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then zpool export $i if [ $? != 0 ]; then - fatal_and_exit "-E- unable to export the local pool $i" + echo "-E- unable to export the local pool $i" + zpool status $i | $mailx -s "zpool scrub unable to export the local pool $i" "$mailto" fi fi - # Update NFS mounts - filesystems=`zfs list -t filesystem | grep "^$i" | grep -v "$i/$i" | grep -v "^$i " | awk '{ print $1 }' | tr '\n' ' '` - zfs set sharenfs=on $filesystems - done