Added new option to expect empty remote lists when backing up to a new disk

[zfs-ubuntu/.git] / zfs-scrub

diff --git a/zfs-scrub b/zfs-scrub
index 840987693424e931cdb3472046d57ac189e2cca5..5388f542b112006994ecab19a9de36171322f8b0 100755 (executable)
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -34,7 +34,7 @@ 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 ]] && [[ "$i" =~ "$backup_pool" ]]; then
+    if [[ $import_export_backup_pool == 1 ]] && [[ "$backup_pool" =~ "$i" ]]; then
       zpool import $i
       if [ $? != 0 ]; then
         fatal_and_exit "-E- unable to import the pool $i"
@@ -80,23 +80,41 @@ do
   date=`date`
   echo "$date: Scrub completed for zfs pool $i"
 
+  # Import the local pool if needed and option was given to do so, else error out
+  # do this so we can check its status to see if it repaired any errors or not
+  zpool list -H "$i" >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    if [[ $import_export_backup_pool == 1 ]] && [[ "$backup_pool" =~ "$i" ]]; then
+      zpool import $i
+      if [ $? != 0 ]; then
+        fatal_and_exit "-E- unable to import the pool $i"
+      fi
+    else
+      fatal_and_exit "-E- The local pool, '$i' doesn't seem to exist."
+    fi
+  fi
+
   # Check for any scrub errors
   zpool status $i | grep scan: 
-  zpool status $i | grep scan: | grep "with 0 errors" > /dev/null 2>&1
+  zpool status $i | grep scan: | grep -e "with 0 errors" -e "in progress" > /dev/null 2>&1
   if [ $? != 0 ]; then
     # The scrub found errors
     zpool status $i | $mailx -s "zpool scrub on $hostname $i found errors" "$mailto" 
   fi 
 
   # Export the local pool if told to do so
-  if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then
-    # Don't export if there is a currently running zfs-replicate operation
+  if [[ $import_export_backup_pool == 1 ]] && [[ "$backup_pool" =~ "$i" ]]; then
+    # Don't export the pool if there is a currently running zfs-replicate operation
     ps -ef | grep -q "zfs-replicate" | grep -v grep
     if [ $? != 0 ]; then
-      zpool export $i
-      if [ $? != 0 ]; then
-        echo "-E- unable to export the local pool $i"
-        zpool status $i | $mailx -s "zpool scrub on $hostname unable to export the local pool $i" "$mailto"
+      # Only export the pool if it is still imported
+      zpool list -H "$i" >/dev/null 2>&1
+      if [ $? == 0 ]; then
+        zpool export $i
+        if [ $? != 0 ]; then
+          echo "-E- unable to export the local pool $i"
+          zpool status $i | $mailx -s "zpool scrub on $hostname unable to export the local pool $i" "$mailto"
+        fi
       fi
     fi
   fi