From owner-freebsd-stable@FreeBSD.ORG Fri Jan 31 17:26:05 2014 Return-Path: Delivered-To: freebsd-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 43EC8BE1 for ; Fri, 31 Jan 2014 17:26:05 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1A4EA1614 for ; Fri, 31 Jan 2014 17:26:05 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id EB3CCB97A; Fri, 31 Jan 2014 12:26:03 -0500 (EST) From: John Baldwin To: "Marat N.Afanasyev" Subject: Re: 10.0, csh history merge broken? Date: Fri, 31 Jan 2014 12:18:07 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <52E0E917.3060403@li.ru> <201401291214.56887.jhb@freebsd.org> <52EBB9CC.2080802@li.ru> In-Reply-To: <52EBB9CC.2080802@li.ru> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201401311218.07914.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 31 Jan 2014 12:26:04 -0500 (EST) Cc: yerenkow@gmail.com, freebsd-stable@freebsd.org, Yamagi Burmeister 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: Fri, 31 Jan 2014 17:26:05 -0000 On Friday, January 31, 2014 9:57:16 am Marat N.Afanasyev wrote: > John Baldwin wrote: > > On Wednesday, January 29, 2014 3:06:24 am Yamagi Burmeister wrote: > >> 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. > > > > Bah, somehow I had thought I had seen the 'lock' keyword in tcsh on my > > HEAD box, but I don't see it there now. > > > So, can we hope to have these patches appear in HEAD and MFC to, at > least, -stable soon? ;) Try asking mp@FreeBSD.org as he did the last tcsh import. -- John Baldwin