Skip to content

Commit d2fa33d

Browse files
committed
quiet down NFS mounts, test lower min_pct threshold
mount -v is too verbose lower --pause, tests should still succeed
1 parent 57273de commit d2fa33d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

regtest.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,12 @@ cleanup() {
9999
sudo exportfs -uav
100100
sudo exportfs -v -o rw,no_root_squash,sync,fsid=15 localhost:$testdir
101101
sleep 1
102-
sudo mount -v -t nfs -o nfsvers=3,tcp,actimeo=1 $localhost_name:$testdir $nfsdir
102+
sudo mount -t nfs -o nfsvers=3,tcp,actimeo=1 $localhost_name:$testdir $nfsdir
103103
if [ $? != $OK ] ; then
104104
echo "NFS mount failed!"
105105
exit $NOTOK
106106
fi
107+
df $nfsdir
107108
}
108109

109110
is_systemctl=1
@@ -362,7 +363,7 @@ json_strs=( 'params' 'file-size' 'file-size-distr' 'files-per-dir' \
362363
'top' 'verify-read' 'xattr-count' 'xattr-size' \
363364
'elapsed-time' 'files-per-sec' 'pct-files-done' \
364365
'per-thread' '00' 'elapsed' 'filenum-final' \
365-
'onhost' 'records' 'status' 'total-files' \
366+
'hosts' 'records' 'status' 'total-files' \
366367
'total-io-requests' 'total-threads')
367368
expect_ct=${#json_strs[*]}
368369
for j in `seq 1 $expect_ct` ; do
@@ -463,7 +464,7 @@ cleanup
463464
for op in `supported_ops $xattrs ''` ; do
464465
echo
465466
echo "testing distributed op $op"
466-
run_one_cmd "$common_params --host-set $localhost_name --stonewall Y --pause 1000 --operation $op"
467+
run_one_cmd "$common_params --host-set $localhost_name --stonewall Y --pause 500 --operation $op"
467468
done
468469

469470
# we do these tests for virtualization (many KVM guests or containers, shared storage but no shared fs)

0 commit comments

Comments
 (0)