Date: Sat, 3 Dec 2016 12:29:10 -0500 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Ulrich Sp??rlein <uqs@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: Git mirroring halted for freebsd-base Message-ID: <20161203172910.GB82677@mutt-hardenedbsd> In-Reply-To: <CAJ9axoSthwAEn9R-b=LdnOGL%2BoXagp8jcU_RfykxRebqLh6SYA@mail.gmail.com> References: <CAJ9axoQH0FuaRghpc3OVTgxT42ykObTni3m9EgHsDKnKFfH7dA@mail.gmail.com> <CAJ9axoR5RFFpX3eTKxg0piLn4UidNrW9jCm-gFJS=m0xVOumzA@mail.gmail.com> <20161203172151.GA82677@mutt-hardenedbsd> <CAJ9axoSthwAEn9R-b=LdnOGL%2BoXagp8jcU_RfykxRebqLh6SYA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--RASg3xLB4tUQ4RcS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 03, 2016 at 06:25:29PM +0100, Ulrich Sp??rlein wrote: > 2016-12-03 18:21 GMT+01:00 Shawn Webb <shawn.webb@hardenedbsd.org>: > > On Sat, Dec 03, 2016 at 12:42:56PM +0100, Ulrich Sp??rlein wrote: > >> 2016-12-02 11:07 GMT+01:00 Ulrich Sp??rlein <uqs@freebsd.org>: > >> > The conversion process started chewing up 100% cpu without making mu= ch progress, first attempts to rectify this have failed. > >> > > >> > The svn2git conversion and pushes to github have been halted. Pushes= to bitbucket also have been halted (we're reaching the 2GB limit imposed b= y bitbucket). > >> > > >> > I'll update this thread in about 24h. > >> > Uli > >> > >> Service is fully restored now for the github mirror, sorry for the dow= ntime. > >> Bitbucket will stop working soon because of the size limitations. > >> Speak up if you require this mirror to be kept up-to-date. > >> > >> Cheers, > >> Uli > > > > Looks like it might be easier for some downstream projects to fully > > recreate their ports repositories from scratch than to try to merge from > > upstream. >=20 > What are you referring to here? The ports repo at https://github.com/freebsd/freebsd-ports was force pushed. Now attempts at merging in upstream's ports tree into hardenedbsd's causes merge conflicts for hundreds of files, including files we didn't change. So I'm forced to either inspect hundreds of files, manually merging in the changes or recreate our ports tree from scratch, re-importing our changes in a single atomic commit. The second option sounds more appealing, though we'd lose the entire history of our changes. Additionally, anyone downstream from HardenedBSD might have to do the same. Domino affect. >=20 > > What caused the issue? What is going to be done to prevent it from > > happening again? >=20 > I have no root cause, other than bitbucket changing permissions and > somehow git ending up using 100% CPU for most of the operations. So no guarantees this massive screw-up won't happen again? --=20 Shawn Webb Cofounder and Security Engineer HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE --RASg3xLB4tUQ4RcS Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYQwDlAAoJEGqEZY9SRW7u2IQQAKYkGsd+OtpOpaYDejfIMHmD HdW8l2OoWqwc/AQdCCwhjDNpLAGqFM1zWp32JVyg47xyL7SVXBosAjMn5zz5Iz13 L7Ysr6HSHFtN6R90GKOmUqNm/kMD+k8CIvD/I8/ziGNSKsxCZL7We6HHs3ecqEtB fa+ryfM9/I4T2/d80rYtaaF0LQQx/r4OIEIzVduUKbbdzRmBGihvdOgwhXTgrp+R s1yyLcQI3GKb44SpTFH+RYQQxhHt8XD3FasV1a0bxvZgmAzHwL/I81koID/D0D6D pQ2fKLyyMFIfoTXcC1MBIm9vmjW4Azg2NoiijapX0JXPovrEdE1nZZHPgCeu0wAG xvMJhaUK//tgJLBHsWbOSFwPxeoWuOLndG+VkN15DjAH0bGng2r1GgbOsVm6VoYS 1pXWktZjvaWMrhzTvADX8S9fG8PFPhkA6bcwBN3oW5GsAS4g/EEMW56NW5V5yB8o tvr3YNYTU3VOJVumkpgPqL2ofxzQh6MVMV06ZfJMjZk+36rojrkaGSwCoGpXEjcy qEJIk2N7Q1XsYjKUI9I+KU4i4d1yK4uhpwRkC9lVw3rNMAKRPNCp98Ycn1dgm2AV kb3u3bHFTaRG+I5ROmQPpC+nNJ0XH/VjsjqwuX6NvX9NlQgb6mE/mym9kjVYvEqM oL3GEviBcJfdzCisA1qf =mTN/ -----END PGP SIGNATURE----- --RASg3xLB4tUQ4RcS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20161203172910.GB82677>