From nobody Wed Sep 6 20:45:03 2023 X-Original-To: dev-commits-src-all@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 4RgvWh1cY1z4sqmF; Wed, 6 Sep 2023 20:45:04 +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 4RgvWh19WLz4fL8; Wed, 6 Sep 2023 20:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033104; 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=P5M6giLsKD6ei32l5zV/AUyXUWRUHcPjohXe1gaZZbk=; b=PDSbGRtD3uxPwIGIcasxJwZ+56VfMGhunZwJCb22g8Alb2uQWe+hQawFsnYbahC2LgGGg5 M8zg2p1XQk22Pygt0kAj3KsHxanXEhLimMfdGL+iBrxpGf5V2nQx6uiAX/kljtxI58Brjf ILlPpWmtkU0GhCYXGBYLd2X86vwW/JiwqnPW/8B2q4eXJiow/7V8pH7BIb9p3vkUNMxVre oUC9fXAnugPdTuJ8oHDx0MQQapI5YogRS/U45JgoFNbMhHkwuA4U0kE5LeRszMQ3/gYO+t 9UIySq0aO0/Kz32Ti378HVNbszbGOk1xdi/9qgqfpr/zaHkOsD6RcS/lSH8xqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033104; a=rsa-sha256; cv=none; b=l3/kixF9Qjk9zTWG4DmzaRUdl60pAaH7unH1TUm1FEyMdfA9WYb2wJdcaVpdy5BvrEETyB mZ88bihzxGLv7NF88th38AHTSiSnCAvJLOZqy42ZC4kAMxT+elPoJ3zQFN60ZQFN7wFywr kI/TsrMkbIOhUFrotlp+kABQ0SArEqqkn+zSUDLRGmXTBmg+/Gh7vndA4LWBO0+tJtkOnG 9uixexJaBfpI9gjYG4VSo5O9nPALKVwhuzEDm0hQQiv8wbrLXEF6usVWbNhNCQQzMCiei4 pK9VeBMyuGml7mWfcovfqaj0T6O7vI7xYYU75A0zdg/NfEwyFGlSIGKk5LTasw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033104; 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=P5M6giLsKD6ei32l5zV/AUyXUWRUHcPjohXe1gaZZbk=; b=hGLLcSAfdBdp+bTMaJRc8hDu25FmWEKO/AX1PKgtebLuCNE66wG5O4yqAxP+HGbYZVA1Sy N2lnPQ17mu4R4mq9BhmIJ9dmBAiVR3igLwM8rZ9X1MhGUc4hMYt6Q68E9/P/9oPb7EYRs2 htuGzq1D3ObV5Eczuqwje7fN2PzxDJWatcQSmepej+Va21z5+OX8JgWh+7x5cTUcgESOte NrCeWkAQ/lmq2/tdC4+nYqsMumw35fAFiVNZpD5hXZlfe8tcY2/618kLD9lu6cRjJs5yxX /EXg67o5EgxYCOto4g5ygpE/82S8yr2xZekT6/hoSSBJ5B84GqmnE4pDYRihBg== 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 4RgvWg74YxzWk8; Wed, 6 Sep 2023 20:45:03 +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 386Kj3xw002609; Wed, 6 Sep 2023 20:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Kj3Or002606; Wed, 6 Sep 2023 20:45:03 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:45:03 GMT Message-Id: <202309062045.386Kj3Or002606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b2c207ddfc45 - stable/13 - Fix the zfsd_autoreplace_001_neg test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b2c207ddfc459b82c0ec5d0c52ab66a9cc169257 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c207ddfc459b82c0ec5d0c52ab66a9cc169257 commit b2c207ddfc459b82c0ec5d0c52ab66a9cc169257 Author: Alan Somers AuthorDate: 2023-07-05 22:37:39 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:44:53 +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. Sponsored by: Axcient (cherry picked from commit be092bcde96bdcfde9013d60e442cca023bfbd1b) --- 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 5020946feb99..2fc631074787 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 @@ -37,7 +37,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: @@ -62,7 +62,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 } @@ -81,9 +81,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"