Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8017 obd: report correct health state of a node
[fs/lustre-release.git]
/
lustre
/
tests
/
parallel-scale-nfs.sh
diff --git
a/lustre/tests/parallel-scale-nfs.sh
b/lustre/tests/parallel-scale-nfs.sh
index
0e07505
..
0f8fead
100755
(executable)
--- a/
lustre/tests/parallel-scale-nfs.sh
+++ b/
lustre/tests/parallel-scale-nfs.sh
@@
-20,7
+20,8
@@
check_and_setup_lustre
cleanup_mount $MOUNT
# mount lustre on mds
lustre_client=$(facet_active_host $SINGLEMDS)
cleanup_mount $MOUNT
# mount lustre on mds
lustre_client=$(facet_active_host $SINGLEMDS)
-[ "$NFSVERSION" = "4" ] && cl_mnt_opt="$MOUNTOPT,32bitapi" || cl_mnt_opt=""
+[ "$NFSVERSION" = "4" ] && cl_mnt_opt="${MOUNT_OPTS:+$MOUNT_OPTS,}32bitapi" ||
+ cl_mnt_opt=""
zconf_mount_clients $lustre_client $MOUNT "$cl_mnt_opt" || \
error "mount lustre on $lustre_client failed"
zconf_mount_clients $lustre_client $MOUNT "$cl_mnt_opt" || \
error "mount lustre on $lustre_client failed"
@@
-61,7
+62,7
@@
mbench_NFILES=${mbench_NFILES:-10000}
[ "$SLOW" = "no" ] && cnt_NRUN=2
# IOR
[ "$SLOW" = "no" ] && cnt_NRUN=2
# IOR
-[ "$SLOW" = "no" ] && ior_DURATION=30
+ior_DURATION=${ior_DURATION:-30}
# source the common file after all parameters are set to take affect
. $LUSTRE/tests/functions.sh
# source the common file after all parameters are set to take affect
. $LUSTRE/tests/functions.sh
@@
-106,6
+107,6
@@
elif ! zconf_mount_clients $CLIENTS $MOUNT; then
error_noexit false "failed to mount lustre after nfs test"
fi
error_noexit false "failed to mount lustre after nfs test"
fi
-complete $
(basename $0) $
SECONDS
+complete $SECONDS
check_and_cleanup_lustre
exit_status
check_and_cleanup_lustre
exit_status