From: Alan J. Pippin <alan@pippins.net>
Date: Sat, 29 Feb 2020 18:13:35 +0000 (-0700)
Subject: Collect messages from zpool export cmds and email those if it fails to export
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/%27.%24link.%27?a=commitdiff_plain;h=802dba950b6593de90330d45ecfc26643cc7bb78;p=zfs-ubuntu%2F.git

Collect messages from zpool export cmds and email those if it fails to export

Change-Id: I7bb12c4fbab23b2c5bf6b63c76a0fb4abf97da33
---

diff --git a/zfs-replicate-all b/zfs-replicate-all
index 999c95e..01f1bec 100755
--- a/zfs-replicate-all
+++ b/zfs-replicate-all
@@ -14,6 +14,7 @@ logfile="$logdir/zfs-replicate.log"
 mylogfile="$logdir/zfs-replicate-all.log"
 date=`date`
 starttime=`date +%s`
+tmpfile=`tempfile`
 
 # Make sure we aren't already running
 SCRIPT_NAME=${0##*/}
@@ -97,7 +98,6 @@ 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
-tmpfile=`tempfile`
 zpool list -H $backup_pool > $tmpfile 2>&1
 if [ $? != 0 ]; then
   if [[ $import_export_backup_pool == 1 ]]; then
@@ -125,7 +125,6 @@ current_backup_marker=@current-backup-${backup_pool_guid}
 previous_backup_marker=@previous-backup-${backup_pool_guid}
 
 # Sort the filesystems to replicate by the oldest backup first
-tmpfile=`tempfile`
 for filesystem in $filesystems_to_replicate; do
   if [[ $filesystem =~ ':' ]]; then
     dst_pool=${filesystem%%:*}
@@ -153,17 +152,19 @@ if [[ $import_export_backup_pool == 1 ]]; then
   # Don't export the pool if there is a currently running zfs-scrub operation
   ps -ef | grep "zfs-scrub" | grep -q "${backup_pool}" | grep -v grep
   if [ $? != 0 ]; then
-    zpool export $backup_pool
+    zpool export $backup_pool >> $tmpfile 2>&1
     if [ $? != 0 ]; then
       sleep 300
-      zpool export $backup_pool
+      zpool export $backup_pool >> $tmpfile 2>&1
       if [ $? != 0 ]; then
-        lsof /$backup_pool/*
-        fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto" 0
+        lsof /$backup_pool/* >> $tmpfile 2>&1
+	msgs=`cat $tmpfile`
+        fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname: $msgs" "$mailto" 0
       fi
     fi
   fi
 fi
+rm -f $tmpfile
 
 done