From owner-svn-src-head@FreeBSD.ORG Mon Sep 15 08:58:19 2014 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B68E1CF; Mon, 15 Sep 2014 08:58:19 +0000 (UTC) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 127AE186; Mon, 15 Sep 2014 08:58:17 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id LAA15369; Mon, 15 Sep 2014 11:58:09 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1XTS6r-000JXo-Iv; Mon, 15 Sep 2014 11:58:09 +0300 Message-ID: <5416A9E8.2080403@FreeBSD.org> Date: Mon, 15 Sep 2014 11:57:12 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.1.0 MIME-Version: 1.0 To: Steven Hartland , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r271429 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201409111621.s8BGLpYJ019867@svn.freebsd.org> In-Reply-To: <201409111621.s8BGLpYJ019867@svn.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Sep 2014 08:58:19 -0000 On 11/09/2014 19:21, Steven Hartland wrote: > Author: smh > Date: Thu Sep 11 16:21:51 2014 > New Revision: 271429 > URL: http://svnweb.freebsd.org/changeset/base/271429 > > Log: > Persist vdev_resilver_txg changes to avoid panic caused by validation > vs a vdev_resilver_txg value from a previous resilver. Looks that this change is a prime candidate for a discussion with OpenZFS folks. I know that it is a pain to go through all hoops for submitting a change to illumos, but at the very least we should let them know of the problem. > MFC after: 1 week > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Thu Sep 11 15:36:36 2014 (r271428) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c Thu Sep 11 16:21:51 2014 (r271429) > @@ -1951,12 +1951,15 @@ vdev_dtl_reassess(vdev_t *vd, uint64_t t > > /* > * If the vdev was resilvering and no longer has any > - * DTLs then reset its resilvering flag. > + * DTLs then reset its resilvering flag and dirty > + * the top level so that we persist the change. > */ > if (vd->vdev_resilver_txg != 0 && > range_tree_space(vd->vdev_dtl[DTL_MISSING]) == 0 && > - range_tree_space(vd->vdev_dtl[DTL_OUTAGE]) == 0) > + range_tree_space(vd->vdev_dtl[DTL_OUTAGE]) == 0) { > vd->vdev_resilver_txg = 0; > + vdev_config_dirty(vd->vdev_top); > + } > > mutex_exit(&vd->vdev_dtl_lock); > > -- Andriy Gapon