X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=zfs-replicate-all;h=62a0ce4d10f60a78cde674427c974341596c413a;hb=refs%2Fremotes%2Forigin%2FHEAD;hp=160bc7c314242c06e8c71f66ecf7f7075a7c9ee2;hpb=617f8787bf69842735128cccf91095b82d549ac4;p=zfs-ubuntu%2F.git

diff --git a/zfs-replicate-all b/zfs-replicate-all
index 160bc7c..62a0ce4 100755
--- a/zfs-replicate-all
+++ b/zfs-replicate-all
@@ -54,7 +54,7 @@ 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"
+  echo -e "$1" | $mailx -s "zfs-replicate-all on $hostname failed" "$mailto"
   exit 1
 }
 
@@ -91,10 +91,10 @@ if [ $? != 0 ]; then
   if [[ $import_export_backup_pool == 1 ]]; then
     zpool import $backup_pool
     if [ $? != 0 ]; then
-      fatal_and_exit "-E- unable to import the backup pool $backup_pool" "$mailto"
+      fatal_and_exit "-E- unable to import the backup pool $backup_pool on $hostname" "$mailto"
     fi
   else 
-    fatal_and_exit "-E- The local backup pool, '$backup_pool' doesn't seem to exist." "$mailto"
+    fatal_and_exit "-E- The local backup pool on $hostname, '$backup_pool' doesn't seem to exist." "$mailto"
   fi
 fi
 
@@ -102,7 +102,7 @@ fi
 backup_pool_guid=`zpool get guid $backup_pool 2>&1 | grep $backup_pool | awk '{ print $3 }'`
 zpool get guid $backup_pool > /dev/null 2>&1
 if [ $? != 0 ]; then
-  fatal_and_exit "-E- Unable to extract the guid for the local backup pool: $backup_pool" "$mailto"
+  fatal_and_exit "-E- Unable to extract the guid for the local backup pool on $hostname: $backup_pool" "$mailto"
 fi
 
 # Setup our backup marker names
@@ -130,9 +130,13 @@ done
 
 # Export the local pool if told to do so
 if [[ $import_export_backup_pool == 1 ]]; then
-  zpool export $backup_pool
+  # Don't export the pool if there is a currently running zfs-scrub operation
+  ps -ef | grep -q "zfs-scrub ${backup_pool}" | grep -v grep
   if [ $? != 0 ]; then
-    fatal_and_exit "-E- unable to export the local backup pool $backup_pool" "$mailto"
+    zpool export $backup_pool
+    if [ $? != 0 ]; then
+      fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto"
+    fi
   fi
 fi