LU-4433 tests: fix mds-survey.sh to support multiple MDTs

[fs/lustre-release.git] / lustre / tests / setup-nfs.sh

diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh
index 7863d40..ea2eb19 100755 (executable)
--- a/lustre/tests/setup-nfs.sh
+++ b/lustre/tests/setup-nfs.sh
@@ -21,9 +21,13 @@ 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 "service rpcidmapd restart" || return 1
+       do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
+                              grep -q rpcidmapd && service rpcidmapd restart ||
+                              true"
 
     do_nodes $LUSTRE_CLIENT "exportfs -o $export_opts_v *:$MNTPNT \
         && exportfs -v" || return 1
@@ -50,12 +54,16 @@ cleanup_nfs() {
     echo -e "\nUnmounting NFS clients..."
     do_nodes $NFS_CLIENTS "umount -f $MNTPNT" || return 1
 
-    echo -e "\nUnexporting Lustre filesystem..."
-    do_nodes $NFS_CLIENTS "service rpcidmapd stop" || return 1
+       echo -e "\nUnexporting Lustre filesystem..."
+       do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
+                              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
+    do_nodes $LUSTRE_CLIENT "exportfs -u *:$MNTPNT"
 
     do_nodes $LUSTRE_CLIENT "exportfs -v"
 }