Skip to content

Allow reconciliation if single dataset is missing snapshots #54

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Allow reconciliation if single dataset is missing snapshots #54

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23428a4
Allow reconciliation if single dataset is missing snapshots
tschettervictor Apr 13, 2025
5b30fc1
Fix reviews
tschettervictor Apr 17, 2025
00af76a
fix spacing and add more info
tschettervictor Apr 17, 2025
5908738
merge loops for setting base and validating snaps
tschettervictor Apr 17, 2025
ee27d94
final edit
tschettervictor Apr 17, 2025
0157309
remove comment in wrong place
tschettervictor Apr 17, 2025
1406d7a
sort all src snaps in reverse to prevent snapshot not found using -r …
tschettervictor Apr 18, 2025
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
53 changes: 46 additions & 7 deletions zfs-replicate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ snapCreate() {
fi
## get source and destination snapshots
srcSnaps=$(snapList "$src" "$srcHost" 1)
srcSnapsAll=$(snapList "$src" "$srcHost" 0 | sort -r)
dstSnaps=$(snapList "$dst" "$dstHost" 0)
for snap in $srcSnaps; do
## while we are here...check for our current snap name
Expand All @@ -335,12 +336,44 @@ snapCreate() {
ss=$(printf "%s\n" "$srcSnaps" | tail -n 1)
## get source snapshot name
sn=$(printf "%s\n" "$ss" | cut -f2 -d@)
## loop over destinations snaps and look for a match
for ds in $dstSnaps; do
dn=$(printf "%s\n" "$ds" | cut -f2 -d@)
if [ "$dn" = "$sn" ]; then
base="$ss"
break
## reset snapCheckFail
snapCheckFail=0
## loop over src/dst snaps and look for a match
for ssnap in $srcSnapsAll; do
## break if snapCheckFail reaches this point again
[ "$snapCheckFail" -eq 0 ] || break
## reset snapMatch variable
snapMatch=0
for dsnap in $dstSnaps; do
## set base snap name
if [ -z "$base" ]; then
dn=$(printf "%s\n" "$dsnap" | cut -f2 -d@)
if [ "$dn" = "$sn" ]; then
base="$ss"
fi
fi
## validate matching snaps for each dataset
## trim first part of dst snap name
dsnap=$(printf "%s\n" "$dsnap" | cut -f2- -d/)
## loop through and try to find a match
if [ "$dsnap" != "$ssnap" ]; then
continue
## if found, set snapMatch var
elif [ "$dsnap" = "$ssnap" ]; then
snapMatch=1
break
fi
done
## if no matching snapshots found, destroy
## if ALLOW_RECONCILIATION=1, otherwise skip set
if [ "$snapMatch" -eq 1 ]; then
continue
elif [ "$snapMatch" -eq 0 ] && [ "${ALLOW_RECONCILIATION}" -eq 1 ]; then
snapDestroy "$ssnap" "$srcHost"
continue
else
snapCheckFail=1
continue
fi
done
## no matching base, are we allowed to fallback?
Expand All @@ -350,7 +383,13 @@ snapCreate() {
printf "WARNING: skipping replication set '%s' - %s\n" "$pair" "$temps" 1>&2
__SKIP_COUNT=$((__SKIP_COUNT + 1))
continue
fi
elif [ "$snapCheckFail" -eq 1 ]; then
temps=$(printf "source snapshot '%s' not in destination dataset: %s" "$ssnap" "$dst")
temps=$(printf "%s - set 'ALLOW_RECONCILIATION=1' to override" "$temps")
printf "WARNING: skipping replication set '%s' - %s\n" "$pair" "$temps" 1>&2
__SKIP_COUNT=$((__SKIP_COUNT + 1))
continue
fi
fi
## without a base snapshot, the destination must be clean
if [ -z "$base" ] && [ "$dstSnapCount" -gt 0 ]; then
Expand Down
Loading