From owner-freebsd-stable@FreeBSD.ORG Wed Jan 29 08:06:37 2014 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21445C7F; Wed, 29 Jan 2014 08:06:37 +0000 (UTC) Received: from mail1.yamagi.org (yugo.yamagi.org [84.201.39.245]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D59221CFD; Wed, 29 Jan 2014 08:06:36 +0000 (UTC) Received: from [212.48.125.110] (helo=lennart.pwag-local.de) by mail1.yamagi.org with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82 (FreeBSD)) (envelope-from ) id 1W8QAC-0005Hn-QZ; Wed, 29 Jan 2014 09:06:26 +0100 Date: Wed, 29 Jan 2014 09:06:24 +0100 From: Yamagi Burmeister To: jhb@freebsd.org Subject: Re: 10.0, csh history merge broken? Message-Id: <20140129090624.615af8881fe6df55c9663b5c@yamagi.org> In-Reply-To: <201401281147.15801.jhb@freebsd.org> References: <52E0E917.3060403@li.ru> <20140126215845.3b62debf03dade433622e9ba@yamagi.org> <201401281147.15801.jhb@freebsd.org> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.22; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: stable@freebsd.org, yerenkow@gmail.com, freebsd-stable@freebsd.org, amarat@li.ru X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2014 08:06:37 -0000 On Tue, 28 Jan 2014 11:47:15 -0500 John Baldwin wrote: > On Monday, January 27, 2014 3:55:53 am Alexander Yerenkow wrote: > > >Maybe it would be a good idea to cherry pick those two revisions and > > >merge then into FreeBSD, until a new tcsh version is released. > > > > I think this is must, since currently any regular shutdown can break login > > ability (if server is high loaded + history file is broken and big enough). > > I have now locked history file with chflags until fix will come. > > These changes are already present in HEAD (FreeBSD 11) and will probably > be merged by the next 10 release. Really? As far as I can see the last commit to head/contrib/tcsh was the update to 6.18.01 one 22/02/2012 by mp@. While 6.18.01 featured a new, much faster history merge logic which minimized the race window, the root cause wasn't solve. Only the two upstream commits (from 08/12/2013 and 11/12/2013) linked above brought real locking to the merge process, serializing it between several tcsh instances. -- Homepage: www.yamagi.org XMPP: yamagi@yamagi.org GnuPG/GPG: 0xEFBCCBCB