Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add raw flag when replicating encrypted datasets #26

Closed
wants to merge 2 commits into from
Closed

Add raw flag when replicating encrypted datasets #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef202b7
add raw flag when replicating encrypted datasets
sevmonster Jul 26, 2021
5663c29
ignore errors when reading encryption value
sevmonster Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@ rep_full() {

if [ -z "$host" ]; then # replicating locally
[ -n "$v_opt" ] && \
echo "zfs send -Lep $C_opt $lsnap | zfs recv -Fu $v_opt -d $rloc"
if zfs send -Lep $C_opt "$lsnap" | zfs recv -Fu $v_opt -d "$rloc"; then
echo "zfs send -Lep $C_opt $raw $lsnap | zfs recv -Fu $v_opt -d $rloc"
if zfs send -Lep $C_opt $raw "$lsnap" | zfs recv -Fu $v_opt -d "$rloc"; then
[ -n "$v_opt" ] && \
echo "zfs bookmark $lsnap $(echo "$lsnap" | sed 's/@/#/')"
zfs bookmark "$lsnap" "$(echo "$lsnap" | sed 's/@/#/')"
Expand All @@ -386,7 +386,7 @@ rep_full() {
else warn "Failed to replicate $lsnap to $sshto:$rloc"
fi
else # replicating remotely
if rsend "-Lep $C_opt $lsnap" "zfs recv -Fu $v_opt -d $rloc"; then
if rsend "-Lep $C_opt $raw $lsnap" "zfs recv -Fu $v_opt -d $rloc"; then
[ -n "$v_opt" ] && \
echo "zfs bookmark $lsnap $(echo "$lsnap" | sed 's/@/#/')"
zfs bookmark "$lsnap" "$(echo "$lsnap" | sed 's/@/#/')"
Expand Down Expand Up @@ -436,9 +436,9 @@ intermediary snapshots will not be sent."
if echo "$sp" | grep -q '@'; then i='-I'; else i='-i'; fi
if [ -z "$host" ]; then # replicate locally
[ -n "$v_opt" ] && \
echo "zfs send -Le $C_opt $i $sp $lsnap | zfs recv -du $F_opt $v_opt \
echo "zfs send -Le $C_opt $raw $i $sp $lsnap | zfs recv -du $F_opt $v_opt \
$rloc"
if zfs send -Le $C_opt $i "$sp" "$lsnap" | zfs recv -du $F_opt $v_opt \
if zfs send -Le $C_opt $raw $i "$sp" "$lsnap" | zfs recv -du $F_opt $v_opt \
"$rloc"; then
[ -n "$v_opt" ] && \
echo "zfs bookmark $lsnap $(echo "$lsnap" | sed 's/@/#/')"
Expand All @@ -449,7 +449,7 @@ $rloc"
else warn "Failed to replicate $lsnap to $sshto:$rloc."
fi
else # replicate remotely
if rsend "-Le $C_opt $i $sp $lsnap" "zfs recv -du $F_opt $v_opt $rloc"; then
if rsend "-Le $C_opt $raw $i $sp $lsnap" "zfs recv -du $F_opt $v_opt $rloc"; then
[ -n "$v_opt" ] && \
echo "zfs bookmark $lsnap $(echo "$lsnap" | sed 's/@/#/')"
if zfs bookmark "$lsnap" "$(echo "$lsnap" | sed 's/@/#/')"; then
Expand Down Expand Up @@ -496,6 +496,12 @@ a resilver in progress."
rsnap=$(ssh "$sshto" "sh -c 'zfs list -rd1 -H -tsnap -o name -S \
creation ${rloc}${fs} 2>/dev/null | head -n1'" | sed 's/^.*@/@/')
fi
# add raw (-w) flag for encrypted datasets
if [ "$(zfs get -H -o value encryption "$1" 2>/dev/null)" != off ]; then
raw='-w'
else
raw=''
fi
if [ -z "$rsnap" ]; then # replicate full stream
[ -n "$v_opt" ] && \
echo "No remote snapshots found. Sending full stream."
Expand Down