From nobody Thu Apr 13 23:42:47 2023 X-Original-To: dev-commits-src-main@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 4PyGNJ3NcSz44tNv; Thu, 13 Apr 2023 23:42:56 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyGNH4hZQz421V; Thu, 13 Apr 2023 23:42:55 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 94.130.64.56 is neither permitted nor denied by domain of pjd@FreeBSD.org) smtp.mailfrom=pjd@FreeBSD.org; dmarc=none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id BD6784F642; Fri, 14 Apr 2023 01:42:51 +0200 (CEST) Message-ID: <319a267e-3f76-3647-954a-02178c260cea@dawidek.net> Date: Fri, 14 Apr 2023 08:42:47 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: Cy Schubert Cc: Mark Millard , vishwin@freebsd.org, Mateusz Guzik , dev-commits-src-main@freebsd.org, Current FreeBSD References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> From: Pawel Jakub Dawidek In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [0.54 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.96)[-0.959]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,freebsd-current@freebsd.org]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; FREEFALL_USER(0.00)[pjd]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org,gmail.com] X-Rspamd-Queue-Id: 4PyGNH4hZQz421V X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N On 4/14/23 07:40, Pawel Jakub Dawidek wrote: > On 4/13/23 22:56, Cy Schubert wrote: >> I'm in the process of building a branch reverting the merge altogether >> and >> will test it on my sandbox machine later today. > > Cy, > > thank you for your testing and patience so far. I'm working on a patch > to revert block cloning without affecting people who already upgraded > their pools. > > I'd also greatly appreciate if you could provide a procedure for me to > reproduce the corruption, ideally without the internet access, as I'll > be on the plane(s) for the next ~24h. Here is the change that reverts most of the modifications and disables cloning new blocks. It does retain ability to free existing cloned blocks and keeps block_cloning feature around, so upgraded pools can be imported and existing cloned blocks freed. It does not handle replaying ZIL with block-cloning logs, so make sure you import pools that were cleanly exported. I'd appreciate if someone who can reproduce those corruptions could try it. https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef68047103 Thank you guys for your help! -- Pawel Jakub Dawidek