Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Oct 2023 22:45:27 GMT
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: c458bf557d66 - stable/14 - zfs: cherry-pick change from master
Message-ID:  <202310222245.39MMjRcN098904@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=c458bf557d66161730ce644af840e968397a377b

commit c458bf557d66161730ce644af840e968397a377b
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2023-10-20 17:30:32 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
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 <cperciva@FreeBSD.org>
    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);
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310222245.39MMjRcN098904>