extern/zfs-auto-snapshot
1
0
Fork 1
mirror of https://github.com/zfsonlinux/zfs-auto-snapshot.git synced 2025-08-17 16:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

issue #8 should be solved by this patch

Browse Source 
all filesystems with snapdir=visible and canmount=on are traversed for
snapshots going to be removed and umount -f is called.

on linux, on /proc/mounts such mounted snapshots are visible (not
listed with 'mount'), but under macosx no proc exists, 'mount' again
does not list them so umount -f is called with no mercy for all
specific combination of fs and snapname  (but should not cause any
problems).

there is no specific logic to utilize /proc/mount on linux, same
approach is taken.
This commit is contained in:
Matus Kral
2012-12-28 20:04:56 +01:00
committed by Darik Horn
parent 6f91e10033
commit 8aaf5f904b
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/zfs-auto-snapshot.sh
View File

@ -202,18 +202,37 @@ do_delete ()
{
local DEL_TYPE="$1"
local SNAPNAME="$2"
local FSSNAPNAME="$2"
local FLAGS="$3"
local FSNAME="$4"
local SNAPNAME=$(echo $FSSNAPNAME | awk -F'@' '{print $2}')
KEEP=$(( $KEEP - 1 ))
if [ "$KEEP" -le '0' ]
then
# be sure to dismount any snapshots with canmount=on and snapdir=visible {ORS="\n"}
umount_list=$(printf "%s\n" $(printf "%s\t%s\n" "${UMOUNT_DESTROY[@]}" | grep ^$FSNAME | awk -F'\t' '{print $2}'))
for kk in ${umount_list[@]}; do
umount_str="umount -f $kk/.zfs/snapshot$kk@$SNAPNAME"
case "$DEL_TYPE" in
(remote)
do_run "$opt_sendtocmd" "zfs destroy $FLAGS '$SNAPNAME'"
do_run "$opt_sendtocmd" "$umount_str"
;;
(local)
do_run "zfs destroy $FLAGS '$SNAPNAME'"
do_run "$umount_str"
;;
esac
test "$FLAGS" != "-r" && break
done
case "$DEL_TYPE" in
(remote)
do_run "$opt_sendtocmd" "zfs destroy $FLAGS '$FSSNAPNAME'"
;;
(local)
do_run "zfs destroy $FLAGS '$FSSNAPNAME'"
;;
esac
@ -329,7 +348,7 @@ do_snapshots () # properties, flags, snapname, oldglob, [targets...]
if [ -z "$opt_keep" ]
then
print_log debu "Number of snapshots not specified. Keeping all."
print_log debug "Number of snapshots not specified. Keeping all."
continue
elif [ "$opt_send" != "no" ] && [ "$SND_RC" -ne '0' ]
then
@ -349,7 +368,7 @@ do_snapshots () # properties, flags, snapname, oldglob, [targets...]
do
# Check whether this is an old snapshot of the filesystem.
test -z "${jj#$ii@$GLOB}" -o -z "${jj##$ii@$opt_prefix*}" -a -n "$opt_remove" \
-a "$opt_send" != "no" && do_delete "local" "$jj" "$FLAGS"
-a "$opt_send" != "no" && do_delete "local" "$jj" "$FLAGS" "$ii"
done
if [ "$opt_send" = "no" -o "$sFLAGS" = "-R" ]
@ -369,7 +388,7 @@ do_snapshots () # properties, flags, snapname, oldglob, [targets...]
for jj in ${SNAPSHOTS_OLD_REM[@]}
do
# Check whether this is an old snapshot of the filesystem.
test -z "${jj#$opt_sendprefix$ii@$GLOB}" && do_delete "remote" "$jj" "$FLAGS"
test -z "${jj#$opt_sendprefix$ii@$GLOB}" && do_delete "remote" "$jj" "$FLAGS" "$ii"
done
done
@ -604,9 +623,10 @@ ZPOOL_STATUS=$(env LC_ALL=C zpool status 2>&1 ) \
|| { print_log error "zpool status $?: $ZPOOL_STATUS"; exit 135; }
ZFS_LIST=$(env LC_ALL=C zfs list -H -t filesystem,volume -s name \
-o name,com.sun:auto-snapshot,com.sun:auto-snapshot:"$opt_label") \
-o name,com.sun:auto-snapshot,com.sun:auto-snapshot:"$opt_label",mountpoint,canmount,snapdir) \
|| { print_log error "zfs list $?: $ZFS_LIST"; exit 136; }
ZFS_LOCAL_LIST=($(echo "$ZFS_LIST" | awk -F'\t' '{ORS="\n"}{print $1}'))
SNAPSHOTS_OLD_LOC=($(env LC_ALL=C zfs list -H -t snapshot -S creation -o name)) \
@ -679,6 +699,11 @@ else
'tolower($2) ~ /false/ || tolower($3) ~ /false/ {print $1}')
fi
UMOUNT_DESTROY=($(echo "$ZFS_LIST" | awk -F '\t' \
'tolower($5) ~ /on/ && tolower($6) ~ /visible/ {OFS="\t";ORS="\n"}{print $1,$4}'))
#echo "${UMOUNT_DESTROY[@]}"
# Initialize the list of datasets that will get a recursive snapshot.
declare -a TARGETS_DRECURSIVE
declare -a TARGETS_TMP_RECURSIVE