From nobody Tue Oct 24 15:58:51 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 4SFGvH3bhnz4yC5Q; Tue, 24 Oct 2023 15:58:51 +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 4SFGvH2cjNz4tpl; Tue, 24 Oct 2023 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698163131; 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=Hqcviu8u+9//laSUTtTUexXVw5zyVA8BiL1Hb+jSoQE=; b=PfjQSXxdVgh+38iht99Jd+qEDq00fiJ+qjUmjMumvo4I/iNKRoH7bVVJjoaCelJhfrMKly ZcpDZUXfypVjHrzL9gELuSf2zZbVLEw9E1KblrVFFj8cnKmMCWOxmMYtgaYYnjrFC9dN9O qJnZ1LiC6w8dh3XQtWtoWKfgHFj3JE5GThEiqkWSjM+2IjjHbTQOIqxLG31OfZJygWVVFT sbz7QVBQNyVzGn/g9QKk+wIcHU/fOCZ3tWhvIwp9ean9ObcBpKOoPZOxhpZQascrgENx15 A7dcQd32/xyNka7+tpBJg1qFZlRQcEFCI0yw/60iuO3dl6pHlWVWob0686i5Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698163131; a=rsa-sha256; cv=none; b=FE2BnA3bATDJ11VyHxVZBxCumgVTZMrJoeKrRMqv8sTqJgJDNbfQo18Gs7RkMFAn/QKAW0 IJmjI5gd++YMwzo9IfBwvxcAKy/2r4FyF+0CUb0UCw4O7f+N6z2GmerbSkRXP2MKQslVFG 84SS6ezYkL4zoZU4Nks9n5cHJcpCEXR6KvMlC3zWR3GI7OWmRpR+EE1jkz2TiBvzpWMHR9 Z/YSnGdei7V8jp6/KUoDnb4ypRMY60gneGG+CPy9x7IBl70Ss/rHmqNO6UpVPej1MwJfzN vfaHrrqXimBGtgL7ye3FZnPV6Hh7usNR8K7Ap3sq5XJYrXn+Bi0hO6D/HNdZdg== 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=1698163131; 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=Hqcviu8u+9//laSUTtTUexXVw5zyVA8BiL1Hb+jSoQE=; b=n1lKGhJZZtPfiUtd4lY9U55Fjc98JY/uflYFIO7sajwjy5zUq/htl/xb+w7P49vx3HBDP7 0ohDn/QHhlJSDAnt/puV8U6Sz2CpChQRtFwyMJt3Bi+vXwagl2sSjl8sxyvF2yPlFNEqJz yCyxq6rm1qOl2g4kafXcYCLgBfK4WQQsLF4h6tdMsgnFotnLtAXW5wkxzMMXBx76QCmQxL u6FUefLaSiJBqv8p7lk5GxqHP5ckdM/mVh2GgNPHo85umV5ijzH/Wj2DxrSSFY1mkA5+8r HZMpyUnKs+OdHxq9MFe1OpuC68OCBk5Zt3OlIDp6vH9k9nitp6j3LZqTiCXWsg== 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 4SFGvH1htxzTbq; Tue, 24 Oct 2023 15:58:51 +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 39OFwpQM022483; Tue, 24 Oct 2023 15:58:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OFwpmn022480; Tue, 24 Oct 2023 15:58:51 GMT (envelope-from git) Date: Tue, 24 Oct 2023 15:58:51 GMT Message-Id: <202310241558.39OFwpmn022480@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: ee3a92d1bffc - releng/14.0 - zfs: cherry-pick change from master 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a commit ee3a92d1bffc27a6a341b97d3a1d2d166fed1d3a Author: Martin Matuska AuthorDate: 2023-10-20 17:30:32 +0000 Commit: Martin Matuska CommitDate: 2023-10-24 15:54:47 +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. Approved by: re (gjb) Requested by: cperciva Co-Authored-By: Colin Percival Obtained from: OpenZFS OpenZFS commit: ea30b5a9e0d266baa13398ed8f9435de050f4b25 (cherry picked from commit c458bf557d66161730ce644af840e968397a377b) --- 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); }