From 3ee5d29e0c5e5c6c740194ea41d3afffd24f01a7 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 27 May 2013 14:18:56 +0800 Subject: [PATCH] LU-2904 tests: mount Lustre client with "32bitapi" Mount Lustre client with "32bitapi" option while exporting a filesystem with a 64-bit root inode. This is a temporary workaround for LU-2904, and it should be removed when there is a patch that fixes the NFS FSID generation problem. Test-Parameters: envdefinitions=SLOW=yes,ENABLE_QUOTA=yes \ clientdistro=el6 serverdistro=el6 clientarch=x86_64 \ serverarch=x86_64 serverjob=lustre-b2_4 serverbuildno=12 \ testlist=parallel-scale-nfsv3,parallel-scale-nfsv4 Signed-off-by: Jian Yu Change-Id: Ia26f3e3d23d901725ab175a6d370f58a1a93519c Reviewed-on: http://review.whamcloud.com/6457 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Fan Yong --- lustre/tests/parallel-scale-nfs.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lustre/tests/parallel-scale-nfs.sh b/lustre/tests/parallel-scale-nfs.sh index 0e07505..64d55f8 100755 --- a/lustre/tests/parallel-scale-nfs.sh +++ b/lustre/tests/parallel-scale-nfs.sh @@ -20,8 +20,15 @@ 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="" -zconf_mount_clients $lustre_client $MOUNT "$cl_mnt_opt" || \ +CL_MNT_OPT="" +if [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.61) ]]; then + # Mount Lustre client with "32bitapi" option while exporting the + # filesystem with a 64-bit root inode. This is a temporary workaround + # for LU-2904, and it should be removed when there is a patch that + # fixes the NFS FSID generation problem. + CL_MNT_OPT="$MOUNTOPT,32bitapi" +fi +zconf_mount_clients $lustre_client $MOUNT "$CL_MNT_OPT" || error "mount lustre on $lustre_client failed" # setup the nfs -- 1.8.3.1