From 1b47ee7ab9a7902d5a97ff550fabf9f635abef30 Mon Sep 17 00:00:00 2001 From: "Alan J. Pippin" Date: Sun, 5 Apr 2020 10:36:50 -0600 Subject: [PATCH] Add feature to try rollback twice if it fails Change-Id: I7b502fbfecaa3269e1dea64b110e95a84ce9b1b7 --- zfs-replicate | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zfs-replicate b/zfs-replicate index 9dfd9f8..02f9924 100755 --- a/zfs-replicate +++ b/zfs-replicate @@ -203,9 +203,13 @@ if [ $no_markers == 0 ]; then # backup was interrupted for some reason. If we don't do this, the zfs send -R command # below may complain about snaps already existing as it tries to resend from the # previous backup marker again from a previously interrupted replicate. - $zfs rollback -r ${backup_pool}/${previous_backup_marker} + $zfs rollback -rf ${backup_pool}/${previous_backup_marker} if [ $? != 0 ]; then - fatal_and_exit "-E- remote incremental $zfs rollback command failed on $hostname" $mailto + 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 + fi fi # Now it should be safe to send the snaps replicate "$zfs send -Rc -I${previous_backup_marker} ${current_backup_marker}" -- 2.34.1