From 1c47c2c42cdc809ce998d7a5b7b0df145201ad89 Mon Sep 17 00:00:00 2001 From: Pavel Zakharov Date: Wed, 6 Nov 2019 13:51:19 -0500 Subject: [PATCH] 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 Reviewed-by: Matt Ahrens Reviewed-by: Brian Behlendorf Signed-off-by: Pavel Zakharov Closes #9545 --- cmd/zvol_wait/zvol_wait | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/zvol_wait/zvol_wait b/cmd/zvol_wait/zvol_wait index e5df82dd37..9a3948da55 100755 --- 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