mirror of
https://git.bashclub.org/bashclub/zsync.git
synced 2024-11-22 01:33:07 +01:00
Fix mountpoint,canmount error on volume replication
This commit is contained in:
parent
6f1f387e22
commit
79aaa3a146
@ -158,9 +158,14 @@ for name in "${syncvols[@]}"; do
|
||||
|
||||
if [[ $debug == "-v" ]]; then log "[DEBUG] $name - Start initial replication"; fi
|
||||
IFS=$'\n'
|
||||
for snap in $($ssh $sshcipher $sshport $source "zfs list -H -t snapshot -o name -S creation $name | grep -E \"$snapshot_filter\" | tail -1"); do
|
||||
for snap in $($ssh $sshcipher $sshport $source "zfs list -H -t snapshot -o name,type -S creation $name | grep -E \"$snapshot_filter\" | tail -1"); do
|
||||
if [[ $(echo $snap | cut -f2) == "filesystem" ]]; then
|
||||
mp=-xmountpoint
|
||||
cm=-xcanmount
|
||||
fi
|
||||
snap=$(echo $snap | cut -f1)
|
||||
log "Start initial replication: $snap => $target/$(echo $name | cut -d'/' -f1)"
|
||||
$ssh $ssh_ipher $sshport $source "zfs send -w -p $debug $snap" | $zfs receive -x mountpoint -x canmount -x $tag -x com.sun:auto-snapshot $debug -dF $target/$(echo $name | cut -d'/' -f1)
|
||||
$ssh $ssh_ipher $sshport $source "zfs send -w -p $debug $snap" | $zfs receive $mp $cm -x $tag -x com.sun:auto-snapshot $debug -dF $target/$(echo $name | cut -d'/' -f1)
|
||||
done
|
||||
fi
|
||||
|
||||
@ -168,9 +173,14 @@ for name in "${syncvols[@]}"; do
|
||||
guid=$($zfs list -H -o guid -s creation -t snapshot $target/$name | tail -1)
|
||||
last=$($ssh $sshcipher $sshport $source "zfs list -H -o name,guid -t snapshot $name | grep $guid | tail -1 | cut -f1")
|
||||
IFS=$'\n'
|
||||
for snap in $($ssh $sshcipher $sshport $source "zfs list -H -o name,guid -s creation -t snapshot $name | grep -E \"$snapshot_filter\" | grep --after-context=200 $guid | grep -v $guid | cut -f1"); do
|
||||
for snap in $($ssh $sshcipher $sshport $source "zfs list -H -o name,type,guid -s creation -t snapshot $name | grep -E \"$snapshot_filter\" | grep --after-context=200 $guid | grep -v $guid | cut -f1-2"); do
|
||||
if [[ $(echo $snap | cut -f2) == "filesystem" ]]; then
|
||||
mp=-xmountpoint
|
||||
cm=-xcanmount
|
||||
fi
|
||||
snap=$(echo $snap | cut -f1)
|
||||
log "Replicating delta of $last => $snap to $target/$name"
|
||||
$ssh $sshcipher $sshport $source "zfs send -w $debug -i $last $snap" | zfs receive -x mountpoint -x canmount -x $tag -x com.sun:auto-snapshot -F $debug $target/$name
|
||||
$ssh $sshcipher $sshport $source "zfs send -w $debug -i $last $snap" | zfs receive $mp $cm -x $tag -x com.sun:auto-snapshot -F $debug $target/$name
|
||||
last=$snap
|
||||
done
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user