X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-replicate-all;h=999c95eb0cec2f11bd634e6dfecf010191f44e4b;hb=65f2beeb586c52a7c7571f43de328b584fa687fd;hp=66949dfaa0c3a4b299dc79c0d4c14f3fa123c688;hpb=7efa74b7c3ad633378498822fe408b3d2da2dcca;p=zfs-ubuntu%2F.git

diff --git a/zfs-replicate-all b/zfs-replicate-all
index 66949df..999c95e 100755
--- a/zfs-replicate-all
+++ b/zfs-replicate-all
@@ -50,16 +50,15 @@ cleanup_and_exit() {
 }
 trap cleanup_and_exit INT
 
-fatal() {
+fatal_and_exit() {
   # echo message to terminal
   echo -e 2>&1 "$1"
   # send email notification
-  echo -e "$1" | $mailx -s "zfs-replicate-all on $hostname failed" "$mailto"
-}
-
-fatal_and_exit() {
-  fatal $*
-  exit 1
+  echo -e "$1" | $mailx -s "zfs-replicate-all on $hostname failed" "$2"
+  # exit with bad return code unless 3rd argument was defined that says not to
+  if [[ -z "$3" ]]; then
+    exit 1
+  fi
 }
 
 # This function executes the replicate command and checks the stoptime
@@ -98,17 +97,21 @@ backup_pools=$backup_pool
 for backup_pool in $backup_pools; do
 
 # Import the local backup pool if needed and the option is given to do so, else error out
-zpool list -H "$backup_pool" >/dev/null 2>&1
+tmpfile=`tempfile`
+zpool list -H $backup_pool > $tmpfile 2>&1
 if [ $? != 0 ]; then
   if [[ $import_export_backup_pool == 1 ]]; then
-    zpool import $backup_pool
+    zpool import $backup_pool >> $tmpfile 2>&1
     if [ $? != 0 ]; then
-      fatal_and_exit "-E- unable to import the backup pool $backup_pool on $hostname" "$mailto"
+      msgs=`cat $tmpfile`
+      fatal_and_exit "-E- unable to import the backup pool '$backup_pool' on $hostname: $msgs" "$mailto"
     fi
   else 
-    fatal_and_exit "-E- The local backup pool on $hostname, '$backup_pool' doesn't seem to exist." "$mailto"
+    msgs=`cat $tmpfile`
+    fatal_and_exit "-E- The local backup pool on $hostname, '$backup_pool' doesn't seem to exist: $msgs" "$mailto"
   fi
 fi
+rm -f $tmpfile
 
 # Obtain the zpool guid for the local backup pool
 backup_pool_guid=`zpool get guid $backup_pool 2>&1 | grep $backup_pool | awk '{ print $3 }'`
@@ -152,8 +155,12 @@ if [[ $import_export_backup_pool == 1 ]]; then
   if [ $? != 0 ]; then
     zpool export $backup_pool
     if [ $? != 0 ]; then
-      lsof /$backup_pool/*
-      fatal "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto"
+      sleep 300
+      zpool export $backup_pool
+      if [ $? != 0 ]; then
+        lsof /$backup_pool/*
+        fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto" 0
+      fi
     fi
   fi
 fi