Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: Fix zpool_reopen_[1-5] on Fedora 35 

The zpool_reopen_[1-5] tests are failing Fedora 35 with:

zpool_reopen_001_pos.ksh[64]: log_must[67]: log_pos[270]:
wait_for_resilver_end[98]: wait_for_action: line 71: func: is read only

Renaming 'func' -> 'funct' fixes the issue.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #12871
This commit is contained in:
Tony Hutter 2021-12-17 12:37:21 -08:00
parent f471a0a0a7
commit 29e05d5345
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.shlib
View File

@ -68,11 +68,11 @@ function wait_for_action #pool timeout function
{ {
typeset pool=$1 typeset pool=$1
typeset -i timeout=$2 typeset -i timeout=$2
typeset func=$3 typeset funct=$3
while [ $timeout -gt 0 ]; do while [ $timeout -gt 0 ]; do
(( --timeout )) (( --timeout ))
if ( $func $pool ); then if ( $funct $pool ); then
return 0 return 0
fi fi
sleep 1 sleep 1