From nobody Wed Jul 5 22:39:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QxF2R34cCz4lyLh; Wed, 5 Jul 2023 22:39:11 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QxF2R2fMkz44YL; Wed, 5 Jul 2023 22:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688596751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2J8dHERqq6d3Rm1gbgKsTxIUHY4XAJ5aOg+9cQ8kUik=; b=siXKYrx2Qd1s7WS8qRp6gfINjiRUftCfse0om/5TO4Pe1V8VgwRRW/h70B9o7beDPgdHxC nzna0Ma+yEqy5Q5bQnqE1VMjf7RtgDf3h7fjduxzLk+gR1+HyVTMIgyF5EaKWTADHORbPw w0vxODIJwzpP2CqFXLgVZefl0g6gjVT4nNjP/T+HDbgbVRyizhoqYUX4iP5N6DfDEmIlw3 Uo1SS8+sP+uQYgePsaRj16eXGeij4kYswqVRm8I2psqkj3QXmYlY4hioHAxoVSn3PdydNv 9bUZc8B3wgeygAS3sOE5RYJ9Q7M7UyJvHHYOkxlaA5cH9HPoxLMDjXrzYPJsHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688596751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2J8dHERqq6d3Rm1gbgKsTxIUHY4XAJ5aOg+9cQ8kUik=; b=jfe9aqlgWM9B2IpJuxkaF+pxYEKRtdLrQcwlyMu50+SaesYUuUdTkJ5jBzXBB5KDqjXttZ RZPYwmBDhHsA1wsgmYJSJqZiVdXqskALJWbobynP0iYbvwiwI4iMngvfmNLCa4PQh0JIkD BZKuF7K/ydh9McaXn/ijLZUgqNA222SC0VMh0UnIyjR2QnGss7E2Qxar5v0D4Nsqt6vEqP Yc6laYtSYCeFFiT7L9j1l0iRiICru1ZbRBtEckSpIX01M+vNuBRCFBJJLhwU1HHI3VBWWy VhC0TlkZecUVCgwJZRpqmVcRHOjkCItmkgWm7Z+MvnnUwMMSnS86YHVuKR1Y8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688596751; a=rsa-sha256; cv=none; b=cDgFjC911Dgtq+o3LjHeHappLTVF/220kP3+ez8b/cLDt8gyl092U8hXETRkrcyPwyo9OL 6zbRC4bVV+O8Wv2LkHNBvPrSObuYUcVkChQ7F8fT8HrwXWV6sApvTEMZ4v7E4yuJja2CSf eBuD5tIABy73k1DDmPQkvRocowjFy93X0DbjYG2ymqyl0a3GKqQrox37ceXr2/vr3N6sxw EANrR5Pd2cmMuOjUlKR94F0k4dMVIgr718ioa0AVKi58wy9Mf176wjPkTMFzW6lDU+MVhM gr/gG4WPen+TxHCfIjimFfNRIvf/wjjr2gyP5GCngG0YMX8OK7To/ZWdhB80nA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QxF2R1cdZzXgx; Wed, 5 Jul 2023 22:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365MdBo1012197; Wed, 5 Jul 2023 22:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365MdB1M012196; Wed, 5 Jul 2023 22:39:11 GMT (envelope-from git) Date: Wed, 5 Jul 2023 22:39:11 GMT Message-Id: <202307052239.365MdB1M012196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: be092bcde96b - main - Fix the zfsd_autoreplace_001_neg test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be092bcde96bdcfde9013d60e442cca023bfbd1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=be092bcde96bdcfde9013d60e442cca023bfbd1b commit be092bcde96bdcfde9013d60e442cca023bfbd1b Author: Alan Somers AuthorDate: 2023-07-05 22:37:39 +0000 Commit: Alan Somers CommitDate: 2023-07-05 22:38:49 +0000 Fix the zfsd_autoreplace_001_neg test It only ever worked by accident. * Actually set autoreplace=off as stated in the description * Wait for the removed device to disappear from the pool before proceeding. * In the assertion, verify that the new disk does not get added, as described in the description. MFC after: 2 weeks Sponsored by: Axcient --- tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh index 9e811d06f94d..7fe855789f28 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh @@ -39,7 +39,7 @@ # ID: zfsd_autoreplace_001_neg # # DESCRIPTION: -# In a pool without the autoreplace property unset, a vdev will not be +# In a pool without the autoreplace property set, a vdev will not be # replaced by physical path # # STRATEGY: @@ -64,7 +64,7 @@ function verify_assertion { # 9. Verify that it does not get added to the pool for ((timeout=0; timeout<4; timeout=$timeout+1)); do - log_mustnot check_state $TESTPOOL $REMOVAL_DISK "ONLINE" + log_mustnot check_state $TESTPOOL $NEW_DISK "ONLINE" $SLEEP 5 done } @@ -83,9 +83,10 @@ log_must create_gnops $OTHER_DISKS for keyword in "${MY_KEYWORDS[@]}" ; do log_must create_gnop $REMOVAL_DISK $PHYSPATH log_must create_pool $TESTPOOL $keyword $ALLNOPS - log_must $ZPOOL set autoreplace=on $TESTPOOL + log_must $ZPOOL set autoreplace=off $TESTPOOL log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 log_must create_gnop $NEW_DISK $PHYSPATH verify_assertion destroy_pool "$TESTPOOL"