Skip to content

Commit

Permalink
zvol_wait script should ignore partially received zvols
Browse files Browse the repository at this point in the history
Partially received zvols won't have links in /dev/zvol.

Reviewed-by: Sebastien Roy <[email protected]>
Reviewed-by: Paul Dagnelie <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Pavel Zakharov <[email protected]>
Closes openzfs#9260
  • Loading branch information
pzakha authored and tonyhutter committed Sep 17, 2019
1 parent 7785be7 commit c347b5f
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions cmd/zvol_wait/zvol_wait
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,30 @@ filter_out_deleted_zvols() {
}

list_zvols() {
zfs list -t volume -H -o name,volmode | while read -r zvol_line; do
zfs list -t volume -H -o name,volmode,receive_resume_token |
while read -r zvol_line; do
name=$(echo "$zvol_line" | awk '{print $1}')
volmode=$(echo "$zvol_line" | awk '{print $2}')
token=$(echo "$zvol_line" | awk '{print $3}')
#
# /dev links are not created for zvols with volmode = "none".
[ "$volmode" = "none" ] || echo "$name"
#
[ "$volmode" = "none" ] && continue
#
# We also also ignore partially received zvols if it is
# not an incremental receive, as those won't even have a block
# device minor node created yet.
#
if [ "$token" != "-" ]; then
#
# Incremental receives create an invisible clone that
# is not automatically displayed by zfs list.
#
if ! zfs list "$name/%recv" >/dev/null 2>&1; then
continue
fi
fi
echo "$name"
done
}

Expand Down

0 comments on commit c347b5f

Please sign in to comment.