From owner-svn-src-all@freebsd.org  Tue Oct  8 15:48:29 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4226C12E52F;
 Tue,  8 Oct 2019 15:48:29 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46nhb10zyNz48s1;
 Tue,  8 Oct 2019 15:48:29 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06AEF22E4;
 Tue,  8 Oct 2019 15:48:29 +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 x98FmSoH078752;
 Tue, 8 Oct 2019 15:48:28 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x98FmSdG078751;
 Tue, 8 Oct 2019 15:48:28 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201910081548.x98FmSdG078751@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 8 Oct 2019 15:48:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353310 - head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Group: head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/tests/sys/cddl/zfs/tests/zfsd
X-SVN-Commit-Revision: 353310
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Oct 2019 15:48:29 -0000

Author: asomers
Date: Tue Oct  8 15:48:28 2019
New Revision: 353310
URL: https://svnweb.freebsd.org/changeset/base/353310

Log:
  zfs: fix the zfsd_hotspare_007_pos test
  
  It was trying to destroy the pool while zfsd was detaching the spare, and
  "zpool destroy" failed.  Fix by waiting until the spare has fully detached.
  
  MFC after:	2 weeks
  Sponsored by:	Axcient

Modified:
  head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh

Modified: head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh	Tue Oct  8 15:33:11 2019	(r353309)
+++ head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh	Tue Oct  8 15:48:28 2019	(r353310)
@@ -82,6 +82,9 @@ function verify_assertion # spare_dev
 
 	# Re-enable the  missing disk
 	log_must create_gnop $REMOVAL_DISK $PHYSPATH
+
+	# And now the spare should be released
+	wait_for_pool_dev_state_change 20 $spare_dev AVAIL
 }
 
 typeset PHYSPATH="some_physical_path"