From: James Nunez <jnunez@whamcloud.com>
Date: Tue, 26 Jun 2018 22:45:04 +0000 (-0600)
Subject: LU-11010 tests: remove calls to return after skip()
X-Git-Tag: 2.12.0-RC1~167
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e2226ae35978f223bf851dabf15eb6b606da8020

LU-11010 tests: remove calls to return after skip()

The skip() routine now contains a call to exit. All calls
to skip() and skip_env() should be reviewed and calls to
return that follow skip() should be removed.

This is the fourth patch in a series that removes calls
to return after skip() in the Lustre test suites.

Calls to return after skip() are removed for:
mmp.sh
ost-pools.sh
parallel-scale-cifs.sh
parallel-scale-nfs.sh
posix.sh

Test-Parameters: trivial testlist=mmp
Test-Parameters: ostcount=1 osscount=1 testlist=ost-pools
Test-Parameters: mdtfilesystemtype=zfs testlist=posix,mmp
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: Ib6e4c81069b142652a0c50c339683dca21f03199
Reviewed-on: https://review.whamcloud.com/32733
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Emoly Liu <emoly@whamcloud.com>
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh
index 6a91d9c..d3b5632 100755
--- a/lustre/tests/mmp.sh
+++ b/lustre/tests/mmp.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
-# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 #
 # Tests for multiple mount protection (MMP) feature.
 #
@@ -25,14 +23,14 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
-remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+remote_mds_nodsh && skip "remote MDS with nodsh"
+remote_ost_nodsh && skip "remote OST with nodsh"
 
 # unmount and cleanup the Lustre filesystem
 MMP_RESTORE_MOUNT=false
 if is_mounted $MOUNT || is_mounted $MOUNT2; then
-    cleanupall
-    MMP_RESTORE_MOUNT=true
+	cleanupall
+	MMP_RESTORE_MOUNT=true
 fi
 
 SAVED_FAIL_ON_ERROR=$FAIL_ON_ERROR
@@ -187,13 +185,11 @@ mmp_init() {
 	init_vars
 
 	if [ $(facet_fstype $MMP_MDS) != ldiskfs ]; then
-		skip "ldiskfs only test"
-		exit
+		skip_env "ldiskfs only test"
 	fi
 
 	if [ $(facet_fstype $MMP_OSS) != ldiskfs ]; then
-		skip "ldiskfs only test"
-		exit
+		skip_env "ldiskfs only test"
 	fi
 
 	mmp_is_enabled $MMP_MDS $MMP_MDSDEV ||
@@ -427,16 +423,16 @@ run_e2fsck() {
 
 # Check whether there are failover pairs for MDS and OSS servers.
 check_failover_pair() {
-    [ "$MMP_MDS" = "$MMP_MDS_FAILOVER" -o "$MMP_OSS" = "$MMP_OSS_FAILOVER" ] \
-        && { skip_env "failover pair is needed" && return 1; }
-    return 0
+	[ "$MMP_MDS" = "$MMP_MDS_FAILOVER" -o "$MMP_OSS" = "$MMP_OSS_FAILOVER" ] &&
+		skip_env "failover pair is needed"
+	return 0
 }
 
 mmp_init
 
 # Test 1 - two mounts at the same time.
 test_1() {
-	check_failover_pair || return 0
+	check_failover_pair
 
 	mount_after_interval 0 0 || return ${PIPESTATUS[0]}
 	stop_services primary || return ${PIPESTATUS[0]}
@@ -446,106 +442,105 @@ run_test 1 "two mounts at the same time"
 
 # Test 2 - one mount delayed by mmp update interval.
 test_2() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    local mdt_interval=$(get_mmp_update_interval $MMP_MDS $MMP_MDSDEV)
-    local ost_interval=$(get_mmp_update_interval $MMP_OSS $MMP_OSTDEV)
+	local mdt_interval=$(get_mmp_update_interval $MMP_MDS $MMP_MDSDEV)
+	local ost_interval=$(get_mmp_update_interval $MMP_OSS $MMP_OSTDEV)
 
-    mount_after_interval $mdt_interval $ost_interval || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval $mdt_interval $ost_interval ||
+		return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 2 "one mount delayed by mmp update interval"
 
 # Test 3 - one mount delayed by 2x mmp check interval.
 test_3() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
-    local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
+	local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
+	local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
 
-    mdt_interval=$((2 * $mdt_interval + 1))
-    ost_interval=$((2 * $ost_interval + 1))
+	mdt_interval=$((2 * $mdt_interval + 1))
+	ost_interval=$((2 * $ost_interval + 1))
 
-    mount_after_interval $mdt_interval $ost_interval || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval $mdt_interval $ost_interval ||
+		return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 3 "one mount delayed by 2x mmp check interval"
 
 # Test 4 - one mount delayed by > 2x mmp check interval.
 test_4() {
-    check_failover_pair || return 0
+	check_failover_pair
 
-    local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
-    local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
+	local mdt_interval=$(get_mmp_check_interval $MMP_MDS $MMP_MDSDEV)
+	local ost_interval=$(get_mmp_check_interval $MMP_OSS $MMP_OSTDEV)
 
-    mdt_interval=$((4 * $mdt_interval))
-    ost_interval=$((4 * $ost_interval))
+	mdt_interval=$((4 * $mdt_interval))
+	ost_interval=$((4 * $ost_interval))
 
-    mount_after_interval $mdt_interval $ost_interval || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	mount_after_interval $mdt_interval $ost_interval ||
+		return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 4 "one mount delayed by > 2x mmp check interval"
 
 # Test 5 - mount during unmount of the first filesystem.
 test_5() {
-    local rc=0
-    check_failover_pair || return 0
+	local rc=0
+	check_failover_pair
 
-    mount_during_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[0]}
+	mount_during_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS ||
+		return ${PIPESTATUS[0]}
 
-    echo
-    start $MMP_MDS $MMP_MDSDEV $MDS_MOUNT_OPTS || return ${PIPESTATUS[0]}
-    mount_during_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
-    rc=${PIPESTATUS[0]}
-    if [ $rc -ne 0 ]; then
-        stop $MMP_MDS || return ${PIPESTATUS[0]}
-        return $rc
-    fi
-
-    stop $MMP_MDS || return ${PIPESTATUS[0]}
+	echo
+	start $MMP_MDS $MMP_MDSDEV $MDS_MOUNT_OPTS || return ${PIPESTATUS[0]}
+	mount_during_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
+	rc=${PIPESTATUS[0]}
+	stop $MMP_MDS || return ${PIPESTATUS[0]}
+	return $rc
 }
 run_test 5 "mount during unmount of the first filesystem"
 
 # Test 6 - mount after clean unmount.
 test_6() {
-    local rc=0
-    check_failover_pair || return 0
+	local rc=0
+	check_failover_pair
 
-    mount_after_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[0]}
+	mount_after_unmount $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS ||
+		return ${PIPESTATUS[0]}
 
-    echo
-    mount_after_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
-    rc=${PIPESTATUS[0]}
-    if [ $rc -ne 0 ]; then
-        stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
-        return $rc
-    fi
+	echo
+	mount_after_unmount $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
+	rc=${PIPESTATUS[0]}
+	if [ $rc -ne 0 ]; then
+		stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
+		return $rc
+	fi
 
-    stop_services failover || return ${PIPESTATUS[0]}
+	stop_services failover || return ${PIPESTATUS[0]}
 }
 run_test 6 "mount after clean unmount"
 
 # Test 7 - mount after reboot.
 test_7() {
-    local rc=0
-    check_failover_pair || return 0
+	local rc=0
+	check_failover_pair
 
-    mount_after_reboot $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS || \
-        return ${PIPESTATUS[0]}
+	mount_after_reboot $MMP_MDSDEV $MMP_MDS $MDS_MOUNT_OPTS ||
+		return ${PIPESTATUS[0]}
 
-    echo
-    mount_after_reboot $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
-    rc=${PIPESTATUS[0]}
-    if [ $rc -ne 0 ]; then
-        stop $MMP_MDS || return ${PIPESTATUS[0]}
-        stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
-        return $rc
-    fi
+	echo
+	mount_after_reboot $MMP_OSTDEV $MMP_OSS $OST_MOUNT_OPTS
+	rc=${PIPESTATUS[0]}
+	if [ $rc -ne 0 ]; then
+		stop $MMP_MDS || return ${PIPESTATUS[0]}
+		stop $MMP_MDS_FAILOVER || return ${PIPESTATUS[0]}
+		return $rc
+	fi
 
-    stop_services failover || return ${PIPESTATUS[0]}
-    stop_services primary || return ${PIPESTATUS[0]}
+	stop_services failover || return ${PIPESTATUS[0]}
+	stop_services primary || return ${PIPESTATUS[0]}
 }
 run_test 7 "mount after reboot"
 
diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index 2256006..4457c92 100755
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -217,8 +217,8 @@ ost_pools_init() {
 }
 
 # Initialization
-remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
-remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+remote_mds_nodsh && skip "remote MDS with nodsh"
+remote_ost_nodsh && skip "remote OST with nodsh"
 ost_pools_init
 
 # Tests for new commands added
@@ -649,7 +649,7 @@ helper_test_7a()
 
 test_7a()
 {
-	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+	[ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs"
 
 	mkdir -p $DIR/$tdir
 
@@ -688,7 +688,7 @@ run_test 7b "try to create pool name with invalid lengths or names"
 
 test_7c()
 {
-	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+	[ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs"
 
 	mkdir -p $DIR/$tdir
 
@@ -714,7 +714,7 @@ run_test 7c "create a valid pool name and setstripe with a bad one"
 test_11() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
-	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" && return
+	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs"
 
 	create_pool_nofail $POOL
 	create_pool_nofail $POOL2
@@ -751,7 +751,7 @@ run_test 11 "OSTs in overlapping/multiple pools"
 test_12() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
-	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >=3 OSTs" && return
+	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >=3 OSTs"
 
 	create_pool_nofail $POOL
 	create_pool_nofail $POOL2
@@ -801,7 +801,7 @@ test_12() {
 run_test 12 "OST Pool Membership"
 
 test_13() {
-	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >= 3 OSTs" && return
+	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >= 3 OSTs"
 
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 	local numfiles=10
@@ -859,15 +859,14 @@ test_13() {
 run_test 13 "Striping characteristics in a pool"
 
 test_14() {
-	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >= 3 OSTs" && return
+	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >= 3 OSTs"
 
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 	local numfiles=100
 	local i
 
 	[ $OSTSIZE -gt $((MAXFREE / OSTCOUNT)) ] &&
-	skip_env "OST size $OSTSIZE is larger than $((MAXFREE / OSTCOUNT))" &&
-			return 0
+	skip_env "OST size $OSTSIZE is larger than $((MAXFREE / OSTCOUNT))"
 
 	create_pool_nofail $POOL
 	create_pool_nofail $POOL2
@@ -1112,6 +1111,8 @@ test_19() {
 run_test 19 "Pools should not come into play when not specified"
 
 test_20() {
+	[[ $OSTCOUNT -ge 2 ]] || skip_env "needs >= 2 OSTs"
+
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 	local numfiles=12
 	local dir1=$POOL_ROOT/dir1
@@ -1162,7 +1163,7 @@ run_test 20 "Different pools in a directory hierarchy."
 
 test_21() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" && return
+	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs"
 
 	local numfiles=12
 	local i=0
@@ -1204,7 +1205,7 @@ add_loop() {
 
 test_22() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" && return
+	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs"
 
 	local numfiles=100
 
@@ -1227,13 +1228,11 @@ run_test 22 "Simultaneous manipulation of a pool"
 
 test_23a() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" && return
+	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs"
 
 	mkdir -p $POOL_ROOT
-	check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS || {
+	check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS ||
 		skip_env "User $RUNAS_ID does not exist - skipping"
-		return 0
-	}
 
 	local i=0
 	local TGT
@@ -1297,12 +1296,11 @@ run_test 23a "OST pools and quota"
 
 test_23b() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" && return 0
+	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs"
 
 	mkdir -p $POOL_ROOT
 	check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS || {
 		skip_env "User $RUNAS_ID does not exist - skipping"
-		return 0
 	}
 
 	local i=0
@@ -1321,7 +1319,7 @@ test_23b() {
 	local AVAIL=$(lfs_df -p $POOL $dir | awk '/summary/ { print $4 }')
 	[ $AVAIL -gt $maxfree ] &&
 		skip_env "Filesystem space $AVAIL is larger than " \
-			"$maxfree limit" && return 0
+			"$maxfree limit"
 
 	echo "OSTCOUNT=$OSTCOUNT, OSTSIZE=$OSTSIZE, AVAIL=$AVAIL"
 	echo "MAXFREE=$maxfree, SLOW=$SLOW"
@@ -1386,11 +1384,11 @@ run_test 23b "OST pools and OOS"
 
 test_24() {
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
-	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" && return
+	[[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs"
 
 	local server_version=$(lustre_version_code $SINGLEMDS)
-		[[ $server_version -ge $(version_code 2.8.56) ]] ||
-		{ skip "Need server version newer than 2.8.55"; return 0; }
+	[[ $server_version -ge $(version_code 2.8.56) ]] ||
+		skip "Need server version newer than 2.8.55"
 
 	local numfiles=10
 	local i=0
@@ -1500,7 +1498,7 @@ test_25() {
 run_test 25 "Create new pool and restart MDS"
 
 test_26() {
-	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >= 3 OSTs" && return
+	[[ $OSTCOUNT -le 2 ]] && skip_env "needs >= 3 OSTs"
 	local dev=$(mdsdevname ${SINGLEMDS//mds/})
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
@@ -1539,7 +1537,7 @@ test_26() {
 run_test 26 "Choose other OSTs in the pool first in the creation remedy"
 
 test_27() {
-	[[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs" && return
+	[[ $OSTCOUNT -le 1 ]] && skip_env "Need at least 2 OSTs"
 
 	local osts
 	local pid
diff --git a/lustre/tests/parallel-scale-cifs.sh b/lustre/tests/parallel-scale-cifs.sh
index 9e99d80..4eaf97a 100644
--- a/lustre/tests/parallel-scale-cifs.sh
+++ b/lustre/tests/parallel-scale-cifs.sh
@@ -35,8 +35,7 @@ SMBCLIENTS=${SMBCLIENTS:-$CLIENTS}
 SMBCLIENTS=$(exclude_items_from_list $SMBCLIENTS $LUSTRE_CLIENT_SMBSRV)
 
 [ -z "$SMBCLIENTS" ] &&
-	skip_env "need at least two nodes: samba server and samba client" &&
-	exit 0
+	skip_env "need at least two nodes: samba server and samba client"
 
 # set CONFIGURE_SMB=false to skip smb config
 CONFIGURE_SMB=${CONFIGURE_SMB:-true}
diff --git a/lustre/tests/parallel-scale-nfs.sh b/lustre/tests/parallel-scale-nfs.sh
index 9676835..1d27a08 100755
--- a/lustre/tests/parallel-scale-nfs.sh
+++ b/lustre/tests/parallel-scale-nfs.sh
@@ -23,7 +23,7 @@ NFS_CLIENTS=$(exclude_items_from_list $NFS_CLIENTS $LUSTRE_CLIENT_NFSSRV)
 NFS_CLIMNTPT=${NFS_CLIMNTPT:-$MOUNT}
 
 [ -z "$NFS_CLIENTS" ] &&
-	skip_env "need at least two nodes: nfs server and nfs client" && exit 0
+	skip_env "need at least two nodes: nfs server and nfs client"
 
 [ "$NFSVERSION" = "4" ] && cl_mnt_opt="${MOUNT_OPTS:+$MOUNT_OPTS,}32bitapi" ||
 	cl_mnt_opt=""
diff --git a/lustre/tests/posix.sh b/lustre/tests/posix.sh
index 429b93d..2f4e9f4 100755
--- a/lustre/tests/posix.sh
+++ b/lustre/tests/posix.sh
@@ -27,7 +27,7 @@ BASELINE_FS=${BASELINE_FS:-"ext4"}
 if [[ $(facet_fstype $SINGLEMDS) = zfs ]]; then
 	BASELINE_FS=zfs
 	! which $ZFS $ZPOOL >/dev/null 2>&1 &&
-		skip_env "need $ZFS and $ZPOOL commands" && exit 0
+		skip_env "need $ZFS and $ZPOOL commands"
 
 	POSIX_ZPOOL=$FSNAME-posix
 	POSIX_ZFS=$POSIX_ZPOOL/${POSIX_ZPOOL##$FSNAME-}