From owner-svn-src-projects@freebsd.org Wed Dec 16 20:48:15 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 5C82BA49783 for ; Wed, 16 Dec 2015 20:48:15 +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 132541802; Wed, 16 Dec 2015 20:48:15 +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 tBGKmEuY069481; Wed, 16 Dec 2015 20:48:14 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGKmESG069480; Wed, 16 Dec 2015 20:48:14 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512162048.tBGKmESG069480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 20:48:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292363 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cache 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: Wed, 16 Dec 2015 20:48:15 -0000 Author: asomers Date: Wed Dec 16 20:48:13 2015 New Revision: 292363 URL: https://svnweb.freebsd.org/changeset/base/292363 Log: Fix cache_009_pos test on sm4u-2. - Fix issues with verify_cache_device(): - Don't assume the device name is at most 3 characters long. - While here, clean up the awk script so it is more legible. - cleanup: Dump the final pool configurations if they exist, for all tests in this suite. Submitted by: Will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Wed Dec 16 20:45:28 2015 (r292362) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Wed Dec 16 20:48:13 2015 (r292363) @@ -30,6 +30,9 @@ function cleanup { + log_note "Final pool configurations:" + poolexists $TESTPOOL && log_must $ZPOOL status -v $TESTPOOL + poolexists $TESTPOOL2 && log_must $ZPOOL status -v $TESTPOOL2 destroy_pool $TESTPOOL destroy_pool $TESTPOOL2 } @@ -104,24 +107,33 @@ function verify_cache_device function parse_name(status) { if (status == "OFFLINE") - return substr($7,6,3) + return substr($7,6) else if (status == "UNAVAIL") - return substr($7,6,3) + return substr($7,6) else return $1 } - BEGIN {start=0} \ - /\tcache/ {start=1} - /\tmirror/ || /\tspares/ || /^$/ {start=0} - (start==1) && /\t (\/|[0-9a-zA-Z])/ \ - {print "stripe:" parse_name($2) " " $2} - (start==1) && /\t (\/|[a-zA-Z])/ \ - {print "mirror:" parse_name($2) " " $2} + BEGIN {in_cache=0} + /\tcache/ {in_cache=1} + /\tlog/ || /\tspares/ || /^$/ {in_cache=0} + + # Skip if not in a cache section + (in_cache==0) { next; } + + /\t (\/|[0-9a-zA-Z])/ { + print "stripe:" parse_name($2) " " $2; + } + + /\t (\/|[a-zA-Z])/ { + print "mirror:" parse_name($2) " " $2; + } + # When hotspare is replacing - (start==1) && /\t (\/|[a-zA-Z])/ \ - {print "mirror:" parse_name($2) " " $2}' - ) + /\t (\/|[a-zA-Z])/ { + print "mirror:" parse_name($2) " " $2; + } + ') typeset -i i=0 typeset find=0