svn commit: r292292 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd

[Alan Somers]

Author: asomers
Date: Tue Dec 15 23:45:11 2015
New Revision: 292292
URL: https://svnweb.freebsd.org/changeset/base/292292

Log:
  tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
  tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
  tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
  tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
  tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
  tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh
  tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh
  	During cleanup, unconditionally reenable any disks that may have
  	been detached.
  
  Sponsored by: Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh
  projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -71,11 +71,8 @@ function cleanup
 
 	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$REMOVAL_DISK" ]; then
-		camcontrol inquiry $REMOVAL_DISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi
 

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -71,11 +71,8 @@ function cleanup
 
 	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$REMOVAL_DISK" ]; then
-		camcontrol inquiry $REMOVAL_DISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi
 

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -73,11 +73,8 @@ function cleanup
 
 	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$REMOVAL_DISK" ]; then
-		camcontrol inquiry $REMOVAL_DISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi
 

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -68,11 +68,8 @@ function cleanup
 
 	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$REMOVAL_DISK" ]; then
-		camcontrol inquiry $REMOVAL_DISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi
 

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -68,11 +68,8 @@ function cleanup
 
 	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$REMOVAL_DISK" ]; then
-		camcontrol inquiry $REMOVAL_DISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi
 

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_import_001_pos.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -69,11 +69,8 @@ function cleanup
 {
   	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$REMOVAL_DISK" ]; then
-		camcontrol inquiry $REMOVAL_DISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi
 

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh	Tue Dec 15 23:06:15 2015	(r292291)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh	Tue Dec 15 23:45:11 2015	(r292292)
@@ -54,12 +54,8 @@ function cleanup
 
 	# See if the phy has been disabled, and try to re-enable it if possible.
 	if [ ! -z "$TMPDISK" ]; then
-		echo "TMPDISK is $TMPDISK"
-		camcontrol inquiry $TMPDISK > /dev/null
-		if [ $? != 0 ]; then
-			if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
-				enable_sas_disk $EXPANDER $PHY
-			fi
+		if [ ! -z "$EXPANDER" ] && [ ! -z "$PHY" ]; then
+			enable_sas_disk $EXPANDER $PHY
 		fi
 	fi