From owner-svn-src-projects@freebsd.org Fri Feb 9 20:56:13 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16D8DF017A0 for ; Fri, 9 Feb 2018 20:56:13 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BBF2A78DBC; Fri, 9 Feb 2018 20:56:12 +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 B2B1F1FC6; Fri, 9 Feb 2018 20:56:12 +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 w19KuCuR074868; Fri, 9 Feb 2018 20:56:12 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19KuCwC074867; Fri, 9 Feb 2018 20:56:12 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802092056.w19KuCwC074867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 9 Feb 2018 20:56:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329081 - 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: 329081 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: Fri, 09 Feb 2018 20:56:13 -0000 Author: asomers Date: Fri Feb 9 20:56:12 2018 New Revision: 329081 URL: https://svnweb.freebsd.org/changeset/base/329081 Log: Fix intermittency in zpool_import_001_pos Add multiple retries to pool 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 Fri Feb 9 20:09:32 2018 (r329080) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_import_001_pos.ksh Fri Feb 9 20:56:12 2018 (r329081) @@ -76,15 +76,25 @@ function verify_export_import #pool #file #chksum typeset pool=$1 typeset file=$2 typeset checksum1=$3 + typeset -i n=0 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 + while ((n < 3)); do + $SYNC + log_note "$ZPOOL busy, retrying export (${n})..." + if ((n == 2)); then + log_must $ZPOOL export $pool + else + $ZPOOL export $pool && break + fi + $SLEEP 1 + n=$((n + 1)) + done fi - log_must $ZPOOL import -d $HOTSPARE_TMPDIR $POOL + log_must $ZPOOL import -d $HOTSPARE_TMPDIR $pool [[ ! -e $file ]] && \ log_fail "$file missing after detach hotspare."