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
Revert "LU-8922 lod: check master stripes properly"
[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
0182c7a
..
4f698c3
100755
(executable)
--- a/
lustre/tests/parallel-scale-nfs.sh
+++ b/
lustre/tests/parallel-scale-nfs.sh
@@
-12,6
+12,7
@@
fi
. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
init_logging
. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
init_logging
+racer=$LUSTRE/tests/racer/racer.sh
. $LUSTRE/tests/setup-nfs.sh
check_and_setup_lustre
. $LUSTRE/tests/setup-nfs.sh
check_and_setup_lustre
@@
-20,7
+21,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"
@@
-49,19
+51,19
@@
generate_machine_file $clients $MACHINEFILE || \
num_clients=$(get_node_count ${clients//,/ })
# compilbench
num_clients=$(get_node_count ${clients//,/ })
# compilbench
-if [ "$SLOW" = "no" ]; then
- cbench_IDIRS=2
- cbench_RUNS=2
-fi
+# Run short iteration in nfs mode
+cbench_IDIRS=${cbench_IDIRS:-2}
+cbench_RUNS=${cbench_RUNS:-2}
# metabench
# metabench
-[ "$SLOW" = "no" ] && mbench_NFILES=10000
+# Run quick in nfs mode
+mbench_NFILES=${mbench_NFILES:-10000}
# connectathon
[ "$SLOW" = "no" ] && cnt_NRUN=2
# IOR
# connectathon
[ "$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
@@
-97,6
+99,11
@@
test_iorfpp() {
}
run_test iorfpp "iorfpp"
}
run_test iorfpp "iorfpp"
+test_racer_on_nfs() {
+ $racer $CLIENTS
+}
+run_test racer_on_nfs "racer on NFS client"
+
# cleanup nfs
cleanup_nfs "$MOUNT" "$lustre_client" "$CLIENTS" || \
error_noexit false "cleanup_nfs failed"
# cleanup nfs
cleanup_nfs "$MOUNT" "$lustre_client" "$CLIENTS" || \
error_noexit false "cleanup_nfs failed"
@@
-106,6
+113,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