From owner-svn-src-projects@freebsd.org Tue Dec 15 23:45:13 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48BADA487D0 for ; Tue, 15 Dec 2015 23:45:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26142125E; Tue, 15 Dec 2015 23:45:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFNjCqn036897; Tue, 15 Dec 2015 23:45:12 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFNjBA1036890; Tue, 15 Dec 2015 23:45:11 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512152345.tBFNjBA1036890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 15 Dec 2015 23:45:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292292 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2015 23:45:13 -0000 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