projects
/
zfs-nexenta
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
22625b0
)
Fixed misnamed throttle opt var
author
Alan J. Pippin
<ajp@pippins.net>
Sat, 17 Jan 2009 22:43:47 +0000
(15:43 -0700)
committer
Alan J. Pippin
<ajp@pippins.net>
Sat, 17 Jan 2009 22:43:47 +0000
(15:43 -0700)
zfs-replicate
patch
|
blob
|
history
diff --git
a/zfs-replicate
b/zfs-replicate
index 84c8c5b30132c35087ce74252baae81b1cd93a5c..347bcbe4ad4223872e5450d0b509ebb6d0d88b5c 100755
(executable)
--- a/
zfs-replicate
+++ b/
zfs-replicate
@@
-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} |
# 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
s
| $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}
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} |
# 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
s
| $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}
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} |
# Send the full filesystem
if [[ $throttle_enable == 1 && -e $throttle ]]; then
ssh $remote $zfs send -R ${current_backup_marker} |
- $throttle $throttle_opt
s
| $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}
else
ssh $remote $zfs send -R ${current_backup_marker} |
$zfs receive -vF -d ${local_pool}/${remote_pool}