From owner-freebsd-hackers@FreeBSD.ORG Thu Feb 12 07:21:40 2004 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EFFD16A4CE for ; Thu, 12 Feb 2004 07:21:40 -0800 (PST) Received: from ion.gank.org (ion.gank.org [69.55.238.164]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E02543D2F for ; Thu, 12 Feb 2004 07:21:40 -0800 (PST) (envelope-from craig@tobuj.gank.org) Received: from localhost (ion.gank.org [69.55.238.164]) by ion.gank.org (mail) with ESMTP id 339802B5C6 for ; Thu, 12 Feb 2004 09:21:40 -0600 (CST) Received: from ion.gank.org ([69.55.238.164]) by localhost (ion.gank.org [69.55.238.164]) (amavisd-new, port 10024) with LMTP id 61222-03 for ; Thu, 12 Feb 2004 09:21:38 -0600 (CST) Received: from owen1492.uf.corelab.com (pix.corelab.com [12.45.169.2]) by ion.gank.org (mail) with ESMTP id C3D752B301 for ; Thu, 12 Feb 2004 09:21:38 -0600 (CST) From: Craig Boston To: freebsd-hackers@freebsd.org Date: Thu, 12 Feb 2004 09:21:33 -0600 User-Agent: KMail/1.6 References: <200402091130.05656.craig@tobuj.gank.org> In-Reply-To: <200402091130.05656.craig@tobuj.gank.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_9n5KA+gJ3HNNzjj" Message-Id: <200402120921.34327.craig@tobuj.gank.org> X-Virus-Scanned: by amavisd-new at gank.org Subject: Subversion/CVS experiment update X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Feb 2004 15:21:40 -0000 --Boundary-00=_9n5KA+gJ3HNNzjj Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Just a quick update -- since the individual directories imported ok I decided to give it a go with the newest (and possibly last before 1.0) subversion, 0.37.0. This time I'm importing the entire src/ repo to see what it can handle. I'm not quite brave enough to go after ports yet :) I'm using cvs2svn.py revision 8587, which is considerably newer than the version included with 0.37.0. If anyone is contemplating playing with subversion, I'd highly recommend grabbing this script out of their SVN repo as it fixes many of the earlier problems. So far, the only problem I've run into was src/usr.sbin/xntpd. It didn't like something about the "udel" branch (claims it can't find the origin record for it). I've hacked around it with the attached patch, which is most likely wrong. If xntpd is the only problem case, it may be cleaner just to 'fix' the RCS files. It looks like there's a copy of a vendor branch or something funny going on. To follow up to the concerns we had about subversion getting slower after a large number of commits, I'm now reasonably certain that it's only the import script that is slowing down. python is gobbling up CPU like there's no tomorrow, but the amount of time spent in svnadmin actually committing seems to be negligible. The other good thing is that memory usage seems to be fairly constant. The resident set has been hovering around 8M and is not increasing. I started the import Monday night, so it's been running for about 60 hours now. python has amassed about 40 hours worth of CPU time: PID USERNAME PRI NICE SIZE RES STATE TIME WCPU CPU COMMAND 19802 craig 139 10 12920K 9292K RUN 40.5H 78.91% 78.91% python So far, it's committed 39,664 revisions and is up to August of 1998. The repo is sitting at 1.4GB in size (there's a script running in the background pruning the db logs every 60 seconds) and cvs2svn is using ~800M of temporary files. Looks like it's currently working on the initial import of picobsd ;) I'm doing other stuff on the machine during the day -- XFree86, gkrellm, KDE, etc. So far ULE is keeping interactive performance snappy, though when I'm doing other things the niced processes tend to get a little "bursty". cvs2svn has it to itself for the other 16 hours. Will follow up on success/failure of the import, which at this rate will probably be done sometime next week... Craig --Boundary-00=_9n5KA+gJ3HNNzjj Content-Type: text/plain; charset="iso-8859-1"; name="cvs2svn-ugly-hack.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="cvs2svn-ugly-hack.patch" --- cvs2svn.py.orig Mon Feb 9 19:52:07 2004 +++ cvs2svn.py Mon Feb 9 19:53:56 2004 @@ -1709,7 +1709,8 @@ else: sys.stderr.write("%s: no origin records for branch '%s'.\n" % (error_prefix, name)) - sys.exit(1) + return +# sys.exit(1) parent_key = parent[name] parent = marshal.loads(self.db[parent_key]) --Boundary-00=_9n5KA+gJ3HNNzjj--