From: Jian Yu <jian.yu@intel.com>
Date: Thu, 4 Jun 2015 23:32:56 +0000 (-0700)
Subject: LU-6690 tests: start nfsserver service for SLES
X-Git-Tag: 2.7.57~23
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=2fe0400eb759b05b660f2fa3718a76da03ba7efb

LU-6690 tests: start nfsserver service for SLES

The NFS server service name in SLES distro is "nfsserver"
instead of "nfs". This patch fixes setup-nfs.sh to start
nfsserver service for SLES.

Test-Parameters: alwaysuploadlogs \
envdefinitions=EXCEPT=compilebench \
mdtfilesystemtype=ldiskfs mdsfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs \
clientdistro=sles11sp3 ossdistro=sles11sp3 mdsdistro=sles11sp3 \
mdtcount=1 testlist=parallel-scale-nfsv3,parallel-scale-nfsv4

Test-Parameters: alwaysuploadlogs \
mdtfilesystemtype=ldiskfs mdsfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs \
clientdistro=el6.6 ossdistro=el6.6 mdsdistro=el6.6 \
mdtcount=1 testlist=parallel-scale-nfsv3,parallel-scale-nfsv4

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: Ifb200400c0fa072fee6f563431be0429e2c79890
Reviewed-on: http://review.whamcloud.com/15149
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh
index 218eb58..0d92fa9 100755
--- a/lustre/tests/setup-nfs.sh
+++ b/lustre/tests/setup-nfs.sh
@@ -21,7 +21,9 @@ setup_nfs() {
         mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs; }" || return 1
     sleep 5
 
-    do_nodes $LUSTRE_CLIENT "service nfs restart" || return 1
+	do_nodes $LUSTRE_CLIENT "chkconfig --list nfsserver > /dev/null 2>&1 &&
+				 service nfsserver restart ||
+				 service nfs restart" || return 1
 
 	do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
 			       grep -q rpcidmapd && service rpcidmapd restart ||
@@ -57,7 +59,9 @@ cleanup_nfs() {
 			       grep -q rpcidmapd && service rpcidmapd stop ||
 			       true"
 
-    do_nodes $LUSTRE_CLIENT "service nfs stop" || return 1
+	do_nodes $LUSTRE_CLIENT "chkconfig --list nfsserver > /dev/null 2>&1 &&
+				 service nfsserver stop || service nfs stop" ||
+				return 1
 
     do_nodes $LUSTRE_CLIENT "exportfs -u *:$MNTPNT" || return 1