Whamcloud - gitweb
LU-13219 tests: add nfs-server service in setup-nfs.sh 63/37663/2
authorJian Yu <yujian@whamcloud.com>
Fri, 21 Feb 2020 08:50:38 +0000 (00:50 -0800)
committerOleg Drokin <green@whamcloud.com>
Sun, 1 Mar 2020 05:37:43 +0000 (05:37 +0000)
For RHEL 8.1, the NFS server service is nfs-server
instead of nfs.

Test-Parameters: trivial \
clientdistro=el8.1 serverdistro=el8.1 \
testlist=parallel-scale-nfsv3,parallel-scale-nfsv4

Change-Id: I5a97c8fe419187412dfc02047ed66141f567d7fb
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/37663
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Wei Liu <sarah@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/tests/setup-nfs.sh

index fa497fb..daed37a 100755 (executable)
@@ -29,7 +29,8 @@ setup_nfs() {
        # restart nfs server according to distro
        do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
                                 service nfsserver restart; } ||
        # restart nfs server according to distro
        do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
                                 service nfsserver restart; } ||
-                                service nfs restart" || return 1
+                                service nfs restart ||
+                                service nfs-server restart" || return 1
 
        do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
                               grep -q rpcidmapd && service rpcidmapd restart ||
 
        do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
                               grep -q rpcidmapd && service rpcidmapd restart ||
@@ -65,7 +66,8 @@ cleanup_nfs() {
 
        do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
                                 service nfsserver stop; } ||
 
        do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
                                 service nfsserver stop; } ||
-                                service nfs stop" || return 1
+                                service nfs stop ||
+                                service nfs-server stop" || return 1
 
        do_nodes $LUSTRE_CLIENT "sed -i '/${MNTPNT##*/}/d' /etc/exports" || return 1
 
 
        do_nodes $LUSTRE_CLIENT "sed -i '/${MNTPNT##*/}/d' /etc/exports" || return 1