Date: Fri, 31 Jan 2014 18:57:16 +0400 From: "Marat N.Afanasyev" <amarat@li.ru> To: John Baldwin <jhb@freebsd.org>, Yamagi Burmeister <lists@yamagi.org> Cc: stable@freebsd.org, yerenkow@gmail.com, freebsd-stable@freebsd.org Subject: Re: 10.0, csh history merge broken? Message-ID: <52EBB9CC.2080802@li.ru> In-Reply-To: <201401291214.56887.jhb@freebsd.org> References: <52E0E917.3060403@li.ru> <201401281147.15801.jhb@freebsd.org> <20140129090624.615af8881fe6df55c9663b5c@yamagi.org> <201401291214.56887.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a cryptographically signed message in MIME format. --------------ms000008090707040002030406 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable 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 <jhb@freebsd.org> 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 proba= bly >>> 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=20 least, -stable soon? ;) --=20 SY, Marat --------------ms000008090707040002030406 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIMaTCC Bi0wggUVoAMCAQICAwdtsTANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMCSUwxFjAUBgNV BAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRl IFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlh dGUgQ2xpZW50IENBMB4XDTEzMDgyOTA4MDMxM1oXDTE0MDgyOTE5MzcxNlowTzEZMBcGA1UE DRMQSXNDMTY0SkczZHE1UlBFUTEVMBMGA1UEAwwMYW1hcmF0QGxpLnJ1MRswGQYJKoZIhvcN AQkBFgxhbWFyYXRAbGkucnUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8T/yW /tVUT1pvIpPVHAgMjikWgAqQrAJPY6W6wKMzPl8XzW3UwpGfzgfeLoG7J2J1t9DujQYf3qqm LWEHgj5FRv6P+9ohdOyH0OqMbG76lz5ONqNcavPdE3//fQEXSxB2SQv1qUp1Dsd522Oavx1r svWlQEkLOnv2ac2mXS86W5kyJ27Pq/6fIgxrNAziKqMm51C3FGDBUn0mofzm3+FcMA4IMOyH kpe+M+iotZaU1OD5bWq4ISH85UioOV3B2OqL0cGM3UmuUJ4Qgi9iMgGPbmsIYQ6+A5LRM1py 8u5Nckt3gSYTvdKHN6dJGcg2Z+Ja0jW+XEvKo5Z+366/Zs6xAgMBAAGjggLSMIICzjAJBgNV HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYD VR0OBBYEFOakEwEDLMFWYaXweQ5/FydTI94RMB8GA1UdIwQYMBaAFFNy7ZKc4NrLAVx8fpY1 TvLUuFGCMBcGA1UdEQQQMA6BDGFtYXJhdEBsaS5ydTCCAUwGA1UdIASCAUMwggE/MIIBOwYL KwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9w b2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1 dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0 byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20g Q0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBj b21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA2BgNVHR8ELzAt MCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEF BQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2Ns YXNzMS9jbGllbnQvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2Nl cnRzL3N1Yi5jbGFzczEuY2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0 YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADtRgWXP13dZs31xY7lDiP2P8jxM05AH SOwd7Fjx6wd/zMF+NMzYKWKiPCU4grfXM5FdMvc+E17QjXFc2Acp8ERx9xbeP1YUys1eXjvK Cpo01/GXoAsnfA2p6Qrc5AVtNhrPkuqB3VrIz+ihRJtEvWHOSuHjMqmEzAAYKaCaaLMCe+j3 Yj1pnTDQXprASuQ7UlBZ9myAFppZPylRdO8pYb4M8qR93steYSwA8TdWWqKzbr7sdaatLpbt WVrjjzIp54s5Psd5hY5lHPYAL6Nx1MJYjk80v7Xh3VSbqndbOCyb1Ix699Y5DF7+B9Yq9Jrl ju8WOgP6QF/u5MegLDB7xsAwggY0MIIEHKADAgECAgEeMA0GCSqGSIb3DQEBBQUAMH0xCzAJ BgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGln aXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMSkwJwYDVQQDEyBTdGFydENvbSBDZXJ0aWZpY2F0 aW9uIEF1dGhvcml0eTAeFw0wNzEwMjQyMTAxNTVaFw0xNzEwMjQyMTAxNTVaMIGMMQswCQYD VQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmlt YXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK AoIBAQDHCYPMzi3YGrEppC4Tq5a+ijKDjKaIQZZVR63UbxIP6uq/I0fhCu+cQhoUfE6ERKKn u8zPf1Jwuk0tsvVCk6U9b+0UjM0dLep3ZdE1gblK/1FwYT5Pipsu2yOMluLqwvsuz9/9f1+1 PKHG/FaR/wpbfuIqu54qzHDYeqiUfsYzoVflR80DAC7hmJ+SmZnNTWyUGHJbBpA8Q89lGxah NvuryGaC/o2/ceD2uYDX9U8Eg5DpIpGQdcbQeGarV04WgAUjjXX5r/2dabmtxWMZwhZna//j diSyrrSMTGKkDiXm6/3/4ebfeZuCYKzN2P8O2F/Xe2AC/Y7zeEsnR7FOp+uXAgMBAAGjggGt MIIBqTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUU3Ltkpzg 2ssBXHx+ljVO8tS4UYIwHwYDVR0jBBgwFoAUTgvvGqRAW6UXaYcwyjRoQ9BBrvIwZgYIKwYB BQUHAQEEWjBYMCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5zdGFydHNzbC5jb20vY2EwLQYI KwYBBQUHMAKGIWh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3Nmc2NhLmNydDBbBgNVHR8EVDBS MCegJaAjhiFodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9zZnNjYS5jcmwwJ6AloCOGIWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL3Nmc2NhLmNybDCBgAYDVR0gBHkwdzB1BgsrBgEEAYG1NwEC ATBmMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMDQG CCsGAQUFBwIBFihodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9pbnRlcm1lZGlhdGUucGRmMA0G CSqGSIb3DQEBBQUAA4ICAQAKgwh9eKssBly4Y4xerhy5I3dNoXHYfYa8PlVLL/qtXnkFgdtY 1o95CfegFJTwqBBmf8pyTUnFsukDFUI22zF5bVHzuJ+GxhnSqN2sD1qetbYwBYK2iyYA5Pg7 Er1A+hKMIzEzcduRkIMmCeUTyMyikfbUFvIBivtvkR8ZFAk22BZy+pJfAoedO61HTz4qSfQo CRcLN5A0t4DkuVhTMXIzuQ8CnykhExD6x4e6ebIbrjZLb7L+ocR0y4YjCl/Pd4MXU91y0vTi pgr/O75CDUHDRHCCKBVmz/Rzkc/b970MEeHt5LC3NiWTgBSvrLEuVzBKM586YoRD9Dy3OHQg WI270g+5MYA8GfgI/EPT5G7xPbCDz+zjdH89PeR3U4So4lSXur6H6vp+m9TQXPF3a0LwZrp8 MQ+Z77U1uL7TelWO5lApsbAonrqASfTpaprFVkL4nyGH+NHST2ZJPWIBk81i6Vw0ny0qZW2N iy/QvVNKbb43A43ny076khXO7cNbBIRdJ/6qQNq9Bqb5C0Q5nEsFcj75oxQRqlKf6TcvGbjx kJh8BYtv9ePsXklAxtm8J7GCUBthHSQgepbkOexhJ0wP8imUkyiPHQ0GvEnd83129fZjoEhd GwXV27ioRKbj/cIq7JRXun0NbeY+UdMYu9jGfIpDLtUUGSgsg2zMGs5R4jGCA90wggPZAgEB MIGUMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20g Q2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwdtsTAJBgUrDgMCGgUA oIICHTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDAxMzEx NDU3MTZaMCMGCSqGSIb3DQEJBDEWBBTkc4k1qJSoyETk5mWtLCfZ8ifIMzBsBgkqhkiG9w0B CQ8xXzBdMAsGCWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcN AwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGlBgkrBgEE AYI3EAQxgZcwgZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSsw KQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9T dGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDB22xMIGn BgsqhkiG9w0BCRACCzGBl6CBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29t IEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2 BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENB AgMHbbEwDQYJKoZIhvcNAQEBBQAEggEAXT3uk77BGRzVE5IoMZKIXXIWKhYENmzJuklTlazK xcZ0yg884ClwdLrLs8XkQH0IY/QU10x19SMQ7w9yxkaytRI2p3CJHVonDjd2j5YBV9Xc04aY JxGUvKuTQWNf/u5ctxdk3KhvxLklILlLNah3uhmF6ej4uNlKhGvLlShDRWw1Oz5X1j/hqrRA LjViJ0nqtrUU3zYneLPUaJlsSRKqXFJZX7+NkeHXVy1DyKZ8uFLXIowkeXRE616sZZm/WNy4 knq9A36BWHE+v35syAul2MyGgfIEpjVNLySWr9xFhIhiqpFOjlzxCjNaCOIFYMlWlwk33v41 UNTj+vYE4ZSUqwAAAAAAAA== --------------ms000008090707040002030406--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52EBB9CC.2080802>