X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale-nfs.sh;h=0f8fead5511cbcc9776c70f8dd7ceddef23e7d8a;hb=10ebe81e394af356fbae4703ca47586d6b3bc367;hp=0e07505f717f7a51a1da0dd5d664bd3e9a0772d1;hpb=f518a40d96d3431f3d68de9eac99ea33498894c7;p=fs%2Flustre-release.git diff --git a/lustre/tests/parallel-scale-nfs.sh b/lustre/tests/parallel-scale-nfs.sh index 0e07505..0f8fead 100755 --- 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) -[ "$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" @@ -61,7 +62,7 @@ mbench_NFILES=${mbench_NFILES:-10000} [ "$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 @@ -106,6 +107,6 @@ elif ! zconf_mount_clients $CLIENTS $MOUNT; then error_noexit false "failed to mount lustre after nfs test" fi -complete $(basename $0) $SECONDS +complete $SECONDS check_and_cleanup_lustre exit_status