From: Alan J. Pippin <alan@pippins.net>
Date: Thu, 23 Sep 2021 16:17:33 +0000 (-0600)
Subject: Added more context information in error messages
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=commitdiff_plain;h=44c4ba0e8f1f00dbd8190d7ca016d2e493a0f87b;p=zfs-ubuntu%2F.git

Added more context information in error messages

Change-Id: Ia45e18f609654d40aa1ac4b4dc2cf17304d4c78b
---

diff --git a/zfs-replicate b/zfs-replicate
index 60a2345..cd38657 100755
--- a/zfs-replicate
+++ b/zfs-replicate
@@ -109,7 +109,7 @@ if [ $? != 0 ]; then
   echo >&2 "    Creating the local filesystem to receive the remote pool into: $backup_pool/$remote_pool"
   $zfs create $backup_pool/$remote_pool
   if [ $? != 0 ]; then
-    fatal_and_exit "-E- remote $zfs on $hostname create command failed" $mailto
+    fatal_and_exit "-E- remote $zfs on $hostname create $backup_pool/$remote_pool command failed" $mailto
   fi
 fi
 
@@ -181,14 +181,14 @@ grep -q ${current_backup_marker} $remote_list
 if [ $? == 0 ]; then
   $ssh $remote $zfs destroy ${current_backup_marker} 
   if [ $? != 0 ]; then
-    fatal_and_exit "-E- remote $zfs destroy on $hostname command failed" $mailto
+    fatal_and_exit "-E- remote $zfs destroy $current_backup_marker on $hostname command failed" $mailto
   fi
 fi
 
 # Create the current backup marker snapshot on the remote system
 $ssh $remote $zfs snapshot ${current_backup_marker}
 if [ $? != 0 ]; then
-  fatal_and_exit "-E- remote $zfs snapshot on $hostname command failed" $mailto
+  fatal_and_exit "-E- remote $zfs snapshot $current_backup_marker on $hostname command failed" $mailto
 fi
 
 # Check to see if the previous backup marker exists in the remote snapshot list.
@@ -213,13 +213,13 @@ if [ $no_markers == 0 ]; then
     sleep 120
     $zfs rollback -rf ${backup_pool}/${previous_backup_marker}
     if [ $? != 0 ]; then
-      fatal_and_exit "-E- remote incremental $zfs rollback command failed on $hostname" $mailto
+      fatal_and_exit "-E- remote incremental $zfs rollback $backup_pool/$previous_backup_marker command failed on $hostname" $mailto
     fi
   fi
   # Now it should be safe to send the snaps
   replicate "$zfs send -Rc -I${previous_backup_marker} ${current_backup_marker}"
   if [ $? != 0 ]; then
-    fatal_and_exit "-E- remote incremental $zfs send command failed on $hostname" $mailto
+    fatal_and_exit "-E- remote incremental $zfs send $previous_backup_marker command failed on $hostname" $mailto
   fi
 else
   # We didn't find any backup markers, next check to see if we have a common snapshot.
@@ -238,7 +238,7 @@ else
     # We found a common snapshot, incrementally send the new snaps
     replicate "$zfs send -Rc -I${common/*@/@} ${current_backup_marker}"
     if [ $? != 0 ]; then
-      fatal_and_exit "-E- remote incremental $zfs send command failed on $hostname" $mailto
+      fatal_and_exit "-E- remote incremental $zfs send $(common/*@/@) command failed on $hostname" $mailto
     fi
   else
     # We did not find any markers or a common snapshot
@@ -249,7 +249,7 @@ else
       if [[ $destroy_local_filesystem_on_full_replicate == 1 ]]; then
         $zfs destroy -r ${backup_pool}/${remote_fs}
         if [ $? != 0 ]; then
-          fatal_and_exit "-E- remote full $zfs destroy command failed on $hostname" $mailto
+          fatal_and_exit "-E- remote full $zfs destroy $backup_pool/$remote_fs command failed on $hostname" $mailto
         fi
       else
         echo "-W- We need to destroy a local filesystem before receiving a full stream."
@@ -260,7 +260,7 @@ else
     # Send the full filesystem
     replicate "$zfs send -Rc ${current_backup_marker}"
     if [ $? != 0 ]; then
-      fatal_and_exit "-E- remote full $zfs send command failed on $hostname" $mailto
+      fatal_and_exit "-E- remote full $zfs send $current_backup_marker command failed on $hostname" $mailto
     fi
   fi
 fi
@@ -274,9 +274,9 @@ sleep 1
 # Rename the current backup marker to be the previous backup marker
 $zfs rename ${backup_pool}/${current_backup_marker} ${backup_pool}/${previous_backup_marker}
 if [ $? != 0 ]; then
-  fatal_and_exit "-E- local $zfs rename command failed on $hostname" $mailto
+  fatal_and_exit "-E- local $zfs rename $backup_pool/$current_backup_marker command failed on $hostname" $mailto
 fi
 $ssh $remote $zfs rename ${current_backup_marker} ${previous_backup_marker}
 if [ $? != 0 ]; then
-  fatal_and_exit "-E- remote $zfs rename command failed on $hostname" $mailto
+  fatal_and_exit "-E- remote $zfs rename $current_backup_marker command failed on $hostname" $mailto
 fi