From owner-svn-src-head@freebsd.org Tue Aug 11 16:58:21 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4658999E833; Tue, 11 Aug 2015 16:58:21 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-la0-x22a.google.com (mail-la0-x22a.google.com [IPv6:2a00:1450:4010:c03::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C0586EEF; Tue, 11 Aug 2015 16:58:20 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: by lahi9 with SMTP id i9so44121260lah.2; Tue, 11 Aug 2015 09:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=kDLdIXs/DunBRZrhiJRJa/rS76OW0G5FN9Yq8Iw+SVs=; b=05/qt/1Fb6JnZHCBeNLGtblg4q61LzBFt3EOZI3ONblfzDPmbXQjzDb9pXVIheC1W0 F20dGQlq+H0FRL1NYygThyaflyv3JDHula2Tqyl62RyL46xZ56La/9pe98quhYgsCz2z BZ42iZK2FRsAhAcRkhYncfIXavOJT7hme4LD4rfNxm7zsIa+5xQlqYRNkizBiterihHd EWdqnc/dH3jWC/dNq6YPwZHj0CFUTtW+En9KUqarm27z+lIa6I0o+xGDgqcuV514ibxt gdYILdH8KGK/zR2oefw4ZJRmNxeEGSFxIlqz5oy6dEr+wTkZeko9cla9uWO7/2P7Dgtq WbNw== X-Received: by 10.152.120.135 with SMTP id lc7mr26976528lab.41.1439312298851; Tue, 11 Aug 2015 09:58:18 -0700 (PDT) Received: from mavbook.mavhome.dp.ua ([134.249.139.101]) by smtp.googlemail.com with ESMTPSA id q5sm589690laj.6.2015.08.11.09.58.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2015 09:58:17 -0700 (PDT) Sender: Alexander Motin Message-ID: <55CA29A6.1000406@FreeBSD.org> Date: Tue, 11 Aug 2015 19:58:14 +0300 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Steven Hartland , Andriy Gapon , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org Subject: Re: svn commit: r286625 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201508111039.t7BAdK1x071658@repo.freebsd.org> <55C9D3A5.1020000@FreeBSD.org> <55CA1921.6030606@multiplay.co.uk> In-Reply-To: <55CA1921.6030606@multiplay.co.uk> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 11 Aug 2015 16:58:21 -0000 On 11.08.2015 18:47, Steven Hartland wrote: > On 11/08/2015 11:51, Andriy Gapon wrote: >> On 11/08/2015 13:39, Alexander Motin wrote: >>> Author: mav >>> Date: Tue Aug 11 10:39:19 2015 >>> New Revision: 286625 >>> URL: https://svnweb.freebsd.org/changeset/base/286625 >>> >>> Log: >>> MFV r277425: >>> 5376 arc_kmem_reap_now() should not result in clearing arc_no_grow >>> Reviewed by: Christopher Siden >>> Reviewed by: George Wilson >>> Reviewed by: Steven Hartland >>> Reviewed by: Richard Elling >>> Approved by: Dan McDonald >>> Author: Matthew Ahrens >>> illumos/illumos-gate@2ec99e3e987d8aa273f1e9ba2b983557d058198c >>> >>> Modified: >>> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c >> Alexander, >> >> thank you very much for bringing all these upstream changes into our >> tree. >> It seems that some of the changes, though, non-trivially overlap with >> FreeBSD-specific changes to ZFS code. I think that this change is one >> of the examples. >> It would be good if a strategy of the resolution of each non-trivial >> conflict was described and possibly discussed. Reviewing the change >> without knowing the general idea behind it is not always easy. >> > I actually eliminated most of the miss-matches between illumos and > FreeBSD in this area pretty recently, so I'm not sure that there's > actually many FreeBSD specific changes, hence conflicts. Given I worked > in this area before I did also make a point of reviewing the upstream > commit. > > That's not to say it wouldn't be good to review these sorts of changes > especially given the potential impact, however we don't have a very good > track record (myself included) in reviewing things so I'm concerned that > would just become a real progress blocker. The fact that we had 6+ months of lag from upstream having several developers in the area tells me that we accumulated too much divergence, so that merging of already reviewed patches makes people worry about another review. I think we should just take big sledgehammer and break through this wall. For those who want to polish their reviewing skills, I'll soon prepare more interesting patch to look at -- merging the new implementation of improved ARC locking from Illumos. That seems to be one of the biggest divergence points. I've managed find a way to apply those patches almost clean, to hope that it will work when the build completes. :) -- Alexander Motin