projects
/
zfs-ubuntu
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ff1ff12
)
Fixed bug in running throttle command on remote machine instead of local
author
Alan J. Pippin
<ajp@pippins.net>
Wed, 19 Mar 2014 02:28:15 +0000
(20:28 -0600)
committer
Alan J. Pippin
<ajp@pippins.net>
Wed, 19 Mar 2014 02:28:15 +0000
(20:28 -0600)
zfs-replicate
patch
|
blob
|
history
diff --git
a/zfs-replicate
b/zfs-replicate
index b0241e853f9630cbfc8684e91a5af59752228df4..1455061c91b4544c3e8fe42c2a498046f85af771 100755
(executable)
--- a/
zfs-replicate
+++ b/
zfs-replicate
@@
-181,8
+181,8
@@
if [ $no_markers == 0 ]; then
fi
# Now it should be safe to send the snaps
if [[ $throttle_enable == 1 && -e $throttle ]]; then
fi
# 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_opt | $zfs receive -vF -d ${backup_pool}/${remote_pool}
+ $ssh $remote
"
$zfs send -R -I${previous_backup_marker} ${current_backup_marker} |
+ $throttle $throttle_opt
"
| $zfs receive -vF -d ${backup_pool}/${remote_pool}
else
$ssh $remote $zfs send -R -I${previous_backup_marker} ${current_backup_marker} |
$zfs receive -vF -d ${backup_pool}/${remote_pool}
else
$ssh $remote $zfs send -R -I${previous_backup_marker} ${current_backup_marker} |
$zfs receive -vF -d ${backup_pool}/${remote_pool}
@@
-206,8
+206,8
@@
else
if [[ -n "$common" ]]; then
# We found a common snapshot, incrementally send the new snaps
if [[ $throttle_enable == 1 && -e $throttle ]]; then
if [[ -n "$common" ]]; then
# 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_opt | $zfs receive -vF -d ${backup_pool}/${remote_pool}
+ $ssh $remote
"
$zfs send -R -I${common/*@/@} ${current_backup_marker} |
+ $throttle $throttle_opt
"
| $zfs receive -vF -d ${backup_pool}/${remote_pool}
else
$ssh $remote $zfs send -R -I${common/*@/@} ${current_backup_marker} |
$zfs receive -vF -d ${backup_pool}/${remote_pool}
else
$ssh $remote $zfs send -R -I${common/*@/@} ${current_backup_marker} |
$zfs receive -vF -d ${backup_pool}/${remote_pool}
@@
-234,8
+234,8
@@
else
fi
# Send the full filesystem
if [[ $throttle_enable == 1 && -e $throttle ]]; then
fi
# Send the full filesystem
if [[ $throttle_enable == 1 && -e $throttle ]]; then
- $ssh $remote $zfs send -R ${current_backup_marker} |
- $throttle $throttle_opt | $zfs receive -vF -d ${backup_pool}/${remote_pool}
+ $ssh $remote
"
$zfs send -R ${current_backup_marker} |
+ $throttle $throttle_opt
"
| $zfs receive -vF -d ${backup_pool}/${remote_pool}
else
$ssh $remote $zfs send -R ${current_backup_marker} |
$zfs receive -vF -d ${backup_pool}/${remote_pool}
else
$ssh $remote $zfs send -R ${current_backup_marker} |
$zfs receive -vF -d ${backup_pool}/${remote_pool}