Added an already running check

[zfs-nexenta/.git] / zfs-replicate

diff --git a/zfs-replicate b/zfs-replicate
index 84c8c5b30132c35087ce74252baae81b1cd93a5c..8b53d1fb0d4e7a53f4475778cb21c02fc4047251 100755 (executable)
--- a/zfs-replicate
+++ b/zfs-replicate
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 # Author: Carl Baldwin & Alan Pippin
 # Description: This script replicates a remote zfs filesystem to a local zfs pool.
@@ -92,7 +92,7 @@ set -x
 # Create the remote lockdir before continuing with the replicate
 # Spinlock on creating the lock
 maxsleeptime=60
-maxattempts=100
+maxattempts=500
 attempts=0
 while true; do
   ssh $remote mkdir "$lockdir" >/dev/null 2>&1
@@ -179,7 +179,7 @@ if [ $no_markers == 0 ]; then
   # Now it should be safe to send the snaps
   if [[ $throttle_enable == 1 && -e $throttle ]]; then
     ssh $remote $zfs send -R -I${previous_backup_marker} ${current_backup_marker} | 
-        $throttle $throttle_opts | $zfs receive -vF -d ${local_pool}/${remote_pool}
+        $throttle $throttle_opt | $zfs receive -vF -d ${local_pool}/${remote_pool}
   else 
     ssh $remote $zfs send -R -I${previous_backup_marker} ${current_backup_marker} |
         $zfs receive -vF -d ${local_pool}/${remote_pool}
@@ -204,7 +204,7 @@ else
     # We found a common snapshot, incrementally send the new snaps
     if [[ $throttle_enable == 1 && -e $throttle ]]; then
       ssh $remote $zfs send -R -I${common/*@/@} ${current_backup_marker} |
-          $throttle $throttle_opts | $zfs receive -vF -d ${local_pool}/${remote_pool}
+          $throttle $throttle_opt | $zfs receive -vF -d ${local_pool}/${remote_pool}
     else
       ssh $remote $zfs send -R -I${common/*@/@} ${current_backup_marker} |
           $zfs receive -vF -d ${local_pool}/${remote_pool}
@@ -232,7 +232,7 @@ else
     # Send the full filesystem
     if [[ $throttle_enable == 1 && -e $throttle ]]; then
       ssh $remote $zfs send -R ${current_backup_marker} |
-          $throttle $throttle_opts | $zfs receive -vF -d ${local_pool}/${remote_pool}
+          $throttle $throttle_opt | $zfs receive -vF -d ${local_pool}/${remote_pool}
     else
       ssh $remote $zfs send -R ${current_backup_marker} |
           $zfs receive -vF -d ${local_pool}/${remote_pool}