Added new throttle option

diff --git a/zfs-replicate b/zfs-replicate
index c7e7c2faa191e30517683605a4258f3fd59608ee..84c8c5b30132c35087ce74252baae81b1cd93a5c 100755 (executable)
--- a/zfs-replicate
+++ b/zfs-replicate
@@ -177,8 +177,13 @@ if [ $no_markers == 0 ]; then
     fatal_and_exit "-E- remote incremental $zfs rollback command failed" $mailto
   fi
   # Now it should be safe to send the snaps
-  ssh $remote $zfs send -R -I${previous_backup_marker} ${current_backup_marker} | 
-      $zfs receive -vF -d ${local_pool}/${remote_pool}
+  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}
+  else 
+    ssh $remote $zfs send -R -I${previous_backup_marker} ${current_backup_marker} |
+        $zfs receive -vF -d ${local_pool}/${remote_pool}
+  fi
   if [ $? != 0 ]; then
     fatal_and_exit "-E- remote incremental $zfs send command failed" $mailto
   fi
@@ -197,8 +202,13 @@ else
 
   if [[ -n "$common" ]]; then
     # We found a common snapshot, incrementally send the new snaps
-    ssh $remote $zfs send -R -I${common/*@/@} ${current_backup_marker} |
-        $zfs receive -vF -d ${local_pool}/${remote_pool}
+    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}
+    else
+      ssh $remote $zfs send -R -I${common/*@/@} ${current_backup_marker} |
+          $zfs receive -vF -d ${local_pool}/${remote_pool}
+    fi
     if [ $? != 0 ]; then
       fatal_and_exit "-E- remote incremental $zfs send command failed" $mailto
     fi
@@ -220,8 +230,13 @@ else
       fi
     fi
     # Send the full filesystem
-    ssh $remote $zfs send -R ${current_backup_marker} |
-        $zfs receive -vF -d ${local_pool}/${remote_pool}
+    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}
+    else
+      ssh $remote $zfs send -R ${current_backup_marker} |
+          $zfs receive -vF -d ${local_pool}/${remote_pool}
+    fi
     if [ $? != 0 ]; then
       fatal_and_exit "-E- remote full $zfs send command failed" $mailto
     fi

diff --git a/zfs-scripts.conf.dist b/zfs-scripts.conf.dist
index 42f387d9dacea22023df146439f49b38dbe57b62..cd9a818e6a52460acd9f67a514125213175e801c 100644 (file)
--- a/zfs-scripts.conf.dist
+++ b/zfs-scripts.conf.dist
@@ -39,6 +39,11 @@ SNAP_UNDER_TEST=
 # Specify the maximum run time in minutes that the replicate script can run for (0=no limit)
 maxruntime=0
 
+# Setup throttling related parameters that will rate limit the zfs send | zfs receive pipe
+throttle_enable=1
+throttle_opt="-M 5"
+throttle=/usr/local/bin/throttle
+
 # Specify the list of filesystems to replicate from the remote to the local_pool (1 per line)
 # (enter 1 filesystem per line)
 filesystems_to_replicate='