Merge all the work Alan's done for the past 8 years

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

diff --git a/zfs-scrub b/zfs-scrub
index 4dfdbd3a29b059a0872869d20fa8729051f7fe3b..fbeadb7156aa814f2b01bbfae97dc404bcecd093 100755 (executable)
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -85,15 +85,19 @@ do
   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 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
-    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 unable to export the local pool $i" "$mailto"
+      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