From nobody Sun Oct 22 22:45:27 2023 X-Original-To: dev-commits-src-branches@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 4SDD1M51xwz4xwjq; Sun, 22 Oct 2023 22:45:27 +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 4SDD1M3DPYz3TSR; Sun, 22 Oct 2023 22:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698014727; 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=ZZL9ojAZXhEeLcNG9JNlOknvL3c6Vnmkx7tWlnPNmFg=; b=Y8uRzSiNcYnFPdJDVd+0vMj7kzVzCxCmZBMb7i3AZkqhaYRsOVav7z9PAMFtX+tKQZpVhx YJ9ZMcFnEnC5WhynDFFeAP/jJC8wf5yHOGPwt7mi90zIpcvwYsYtKW/xOIbIVkETyfbVmb /mQUUuvc6Tj1TGIlE2BhV+RZerX7+KTT4tqgcdtjYJLHAC80zqJKznProbbqhlEoJKanfn cApactxLhCMv+fjOJ27+P9yh97BsTkMXF2uInlJ4h7stAiCXDia0VkSK/2Txj+gHy3HMnl YEWQ7CA+vY8ASYsR/CmOdEb67s3KTmwlfJnfmEfx1gdhZn5fpPAOHrMqnCFKMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698014727; a=rsa-sha256; cv=none; b=Pz6FD5wRCg5OygGBf4Z3cEJs+TW5wb+AzT1Lwa+dv8VX96ccX7T1YdEpF72We7OW6G3KdB WzuFqYvhALAzuECX3zyHlr/ZfRYYLbw8s90BpTRHTbocR29168CNK2HbDgshvrlGxU5B7z 30Z0E9RfoTvQ+OAUE9BotG22+oib66FPGv/KkzoSe1rJpdTA0KzYnRKBpqREae2hQf2ezq Dopa6g47gdKgoECBQRF0Eol5mu48cnchYq4Tnr5RMHvNOrWXDmqS2x3NG4xVNu3svg5257 kGZbauNHIfbvq2b7BGpPl0ijTg/S9qYOUiWAvLkKyVVHmECLbbkkgWjMmFqW4A== 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=1698014727; 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=ZZL9ojAZXhEeLcNG9JNlOknvL3c6Vnmkx7tWlnPNmFg=; b=ZoGvWlN5qVEaxKY6MPLd/2O2kTfJpjOI07GqJckrDhzumAc1t60Q8i9CMFoC5NHYl6fhye t7kZIj+CatRG1tig9vrN3KeIniKfjgE1t2pi5+ON3ewPTfsSxk5zPra4IN/UI79wGIxUYd zCoAd7KFNot/Ul6tcqrXjKVF7rJtO3a01djhnDai8zmPW8Sz3ycDbQdWmqE9bNklWSB4pC zj8TQ0phdzllH2gnvMqJ2ERKvL2dstk1uchUzG5Fz/uHOB2dL6b/ApL3eFKzMsiJZd8hc8 yLxehWRFmIrZaGL3Bx393XidKtKRvDal02XbsIhdz/DC2R8jbKhbUeOev7n4Vg== 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 4SDD1M2HYxz1Nc; Sun, 22 Oct 2023 22:45:27 +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 39MMjR8Z098907; Sun, 22 Oct 2023 22:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39MMjRcN098904; Sun, 22 Oct 2023 22:45:27 GMT (envelope-from git) Date: Sun, 22 Oct 2023 22:45:27 GMT Message-Id: <202310222245.39MMjRcN098904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: c458bf557d66 - stable/14 - zfs: cherry-pick change from master List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c458bf557d66161730ce644af840e968397a377b Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=c458bf557d66161730ce644af840e968397a377b commit c458bf557d66161730ce644af840e968397a377b Author: Martin Matuska AuthorDate: 2023-10-20 17:30:32 +0000 Commit: Martin Matuska CommitDate: 2023-10-22 22:45:03 +0000 zfs: cherry-pick change from master #15405 ea30b5a9e Set spa_ccw_fail_time=0 when expanding a vdev Fixes 5-minute autoexpand delay on ZFS-root VM images. Requested by: cperciva Co-Authored-By: Colin Percival Obtained from: OpenZFS OpenZFS commit: ea30b5a9e0d266baa13398ed8f9435de050f4b25 --- sys/contrib/openzfs/module/zfs/vdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c index 87c145593237..afb01c0ef7fd 100644 --- a/sys/contrib/openzfs/module/zfs/vdev.c +++ b/sys/contrib/openzfs/module/zfs/vdev.c @@ -4215,6 +4215,7 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate) /* XXX - L2ARC 1.0 does not support expansion */ if (vd->vdev_aux) return (spa_vdev_state_exit(spa, vd, ENOTSUP)); + spa->spa_ccw_fail_time = 0; spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE); }