zvol_wait should ignore redacted zvols

zvol_wait waits for zvol links to be created under /dev/zvol for each zvol.
Links are not created for redacted zvols so we should ignore those.

Reviewed-by: Paul Dagnelie <pcd@delphix.com>
Reviewed-by: Matt Ahrens <matt@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Pavel Zakharov <pavel.zakharov@delphix.com>
Closes #9545

diff --git a/cmd/zvol_wait/zvol_wait b/cmd/zvol_wait/zvol_wait
index e5df82dd376a8b0b87e4b64c4ae2ecf7fd426088..9a3948da5564877f83931e584c905246d0072522 100755 (executable)
--- a/cmd/zvol_wait/zvol_wait
+++ b/cmd/zvol_wait/zvol_wait
@@ -25,15 +25,19 @@ filter_out_deleted_zvols() {
 }
 
 list_zvols() {
-       zfs list -t volume -H -o name,volmode,receive_resume_token |
+       zfs list -t volume -H -o \
+               name,volmode,receive_resume_token,redact_snaps |
                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}')
+               redacted=$(echo "$zvol_line" | awk '{print $4}')
                #
-               # /dev links are not created for zvols with volmode = "none".
+               # /dev links are not created for zvols with volmode = "none"
+               # or for redacted zvols.
                #
                [ "$volmode" = "none" ] && continue
+               [ "$redacted" = "-" ] || continue
                #
                # We also also ignore partially received zvols if it is
                # not an incremental receive, as those won't even have a block