From owner-svn-src-projects@freebsd.org Tue Nov 14 22:30:49 2017 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 AD207DDF94F for ; Tue, 14 Nov 2017 22:30:49 +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 768F5722F6; Tue, 14 Nov 2017 22:30:49 +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 vAEMUmZh087574; Tue, 14 Nov 2017 22:30:48 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAEMUmCX087573; Tue, 14 Nov 2017 22:30:48 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201711142230.vAEMUmCX087573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 14 Nov 2017 22:30:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325833 - projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Commit-Revision: 325833 X-SVN-Commit-Repository: base 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.25 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, 14 Nov 2017 22:30:49 -0000 Author: asomers Date: Tue Nov 14 22:30:48 2017 New Revision: 325833 URL: https://svnweb.freebsd.org/changeset/base/325833 Log: Fix intermittency in hotspare_import_001_pos tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh This test would occasionally fail because "zpool export" returns EBUSY. That's not unexpected since it immediately follows "zpool replace" and ZFS allows only one configuration change per transaction group. Usually a txg will close as soon as resilvering finishes, but sometimes "zpool export" sneaks in first. To fix the problem, allow up to one retry of "zpool export" Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh Tue Nov 14 22:22:50 2017 (r325832) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh Tue Nov 14 22:30:48 2017 (r325833) @@ -77,7 +77,13 @@ function verify_export_import #pool #file #chksum typeset file=$2 typeset checksum1=$3 - log_must $ZPOOL export $pool + if ! $ZPOOL export $pool; then + # Rarely, this can fail with EBUSY if the pool's configuration + # has already changed within the same transaction group. In + # that case, it is appropriate to retry. + $SYNC + log_must $ZPOOL export $POOL + fi log_must $ZPOOL import -d $HOTSPARE_TMPDIR $pool [[ ! -e $file ]] && \