X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-scrub;h=fe94f81de80c4233556e25ab770a07264ad5dc47;hb=f19b57818168810451d4722f458101884fd95b38;hp=495adf4f9b7ab4c795727c7e3e810dcbe092e4be;hpb=0b4e25e42e934ccd5258a5659ed15c394b7f0a62;p=zfs-ubuntu%2F.git

diff --git a/zfs-scrub b/zfs-scrub
index 495adf4..fe94f81 100755
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -80,6 +80,20 @@ 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 ]] && [[ "$i" =~ "$backup_pool" ]]; 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
@@ -90,10 +104,18 @@ do
 
   # Export the local pool if told to do so
   if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then
-    zpool export $i
+    # 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
-      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