X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=zfs-replicate;fp=zfs-replicate;h=02f9924ad6c8a7a2f48ded18ab10f60cf62da2df;hb=1b47ee7ab9a7902d5a97ff550fabf9f635abef30;hp=9dfd9f8cbef7997e28bb6bd9ce72d164ce812250;hpb=802dba950b6593de90330d45ecfc26643cc7bb78;p=zfs-ubuntu%2F.git

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}"