Skip to content

Commit

Permalink
ZTS: Debug zfs_share_concurrent_shares failure
Browse files Browse the repository at this point in the history
Update zfs_share_concurrent_shares test case to wait a few seconds
and recheck that the filesystem isn't shared.  The intent here is
determine the nature of the error and if it may be a race.

Signed-off-by: Brian Behlendorf <[email protected]>
  • Loading branch information
behlendorf committed Oct 10, 2023
1 parent 483ccf0 commit 69c157b
Showing 1 changed file with 34 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,26 @@ function test_share # filesystem

zfs set sharenfs=on $filesystem || \
sub_fail "zfs set sharenfs=on $filesystem failed."
is_shared $mntp || \
sub_fail "File system $filesystem is not shared (set sharenfs)."

#
# Verify 'zfs share' works as well.
# Verify 'zfs share' results in a shared mount. We check this
# multiple times because of Fedora 37+ it's been observed in
# the CI that the share may not be immediately reported.
#
for retry in $(seq 1 10); do
is_shared $mntp && break

log_note "Wait $retry / 10 for is_shared $mntp (set sharenfs)"

if [[ $retry -eq 10 ]]; then
sub_fail "File system $filesystem is not shared (set sharenfs)."
fi

sleep 1
done

#
# Verify 'zfs unshare' works as well.
#
zfs unshare $filesystem || \
sub_fail "zfs unshare $filesystem failed."
Expand All @@ -112,9 +127,23 @@ function test_share # filesystem

zfs share $filesystem || \
sub_fail "zfs share $filesystem failed."
is_shared $mntp || \
sub_fail "file system $filesystem is not shared (zfs share)."

#
# Verify 'zfs share' results in a shared mount. We check this
# multiple times because of Fedora 37+ it's been observed in
# the CI that the share may not be immediately reported.
#
for retry in $(seq 1 10); do
is_shared $mntp && break

log_note "Wait $retry / 10 for is_shared $mntp (zfs share)"

if [[ $retry -eq 10 ]]; then
sub_fail "File system $filesystem is not shared (zfs share)."
fi

sleep 1
done

#log_note "Sharing a shared file system fails."
zfs share $filesystem && \
Expand Down

0 comments on commit 69c157b

Please sign in to comment.