For Xen developers: hg 0.7 was just released today. Here is a summary of the changes: http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew If you''re a Xen developer, please upgrade to 0.7. Merges with older versions of hg are causing problems like this for me: local changed xen/arch/ia64/xenasm.S which remote deleted ... when I did not change xenasm.S at all. In general I''ve seen a lot of "merge?" messages on xen-commit; the improved merge logic may reduce these. Also, there were a bunch of rename and copy fixes made, which I guess we use a lot. -- Hollis Blanchard IBM Linux Technology Center _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
nifty - but 0.7 is not backward compatible with 0.6b: %hg clone http://xenbits.xensource.com/xen-unstable.hg requesting all changes adding changesets adding manifests adding file changes added 6917 changesets with 0 changes to 0 files ** unknown exception encountered, details follow ** report bug details to mercurial@selenic.com Traceback (most recent call last): File "/usr/local/bin/hg", line 13, in ? commands.run() File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 2010, in run sys.exit(dispatch(sys.argv[1:])) File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 2150, in dispatch return d() File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 2137, in <lambda> d = lambda: func(u, *args, **cmdoptions) File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 668, in clone update(ui, repo) File "/usr/local/lib/python2.4/site-packages/mercurial/commands.py", line 1746, in update return repo.update(node, allow=merge, force=clean) File "/usr/local/lib/python2.4/site-packages/mercurial/localrepo.py", line 1028, in update pa = self.changelog.ancestor(p1, p2) File "/usr/local/lib/python2.4/site-packages/mercurial/revlog.py", line 427, in ancestor dist[n] = max(dist[p1], dist[p2]) + 1 KeyError: ''cfBc2a2a12bd6ver.\n\x00\x00'' On 9/16/05, Hollis Blanchard <hollisb@us.ibm.com> wrote:> > For Xen developers: > > hg 0.7 was just released today. Here is a summary of the changes: > http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew > > If you''re a Xen developer, please upgrade to 0.7. Merges with older > versions > of hg are causing problems like this for me: > local changed xen/arch/ia64/xenasm.S which remote deleted > ... when I did not change xenasm.S at all. In general I''ve seen a lot of > "merge?" messages on xen-commit; the improved merge logic may reduce > these. > > Also, there were a bunch of rename and copy fixes made, which I guess we > use a > lot. > > -- > Hollis Blanchard > IBM Linux Technology Center > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Tue, Sep 20, 2005 at 06:07:34PM -0700, Kip Macy wrote:> nifty - but 0.7 is not backward compatible with 0.6b: > %hg clone http://xenbits.xensource.com/xen-unstable.hg > requesting all changes > adding changesets > adding manifests > adding file changes > added 6917 changesets with 0 changes to 0 files > ** unknown exception encountered, details follow > ** report bug details to mercurial@selenic.comNot so hasty. The bug is in fact that xenbits is sometimes running out of memory. Other times it works just fine. Here are the relevant bits from my diagnosis this morning: ---- And then I added exception handling to the pull code, so that it now does this: abort: premature EOF reading chunk (got 75478 bytes, expected 1651992944)! That expected number says there''s probably something else in the stream. Firing up Ethereal and tracing a connection shows: <!-- The above is a description of an error in a Python program, formatted for a Web browser because the ''cgitb'' module was enabled. In case you are not reading this in a Web browser, here is the original traceback: Traceback (most recent call last): File "/var/www/html/xen-unstable.hg", line 9, in ? h.run() File "/usr/local/hg-0.6c/lib/python/mercurial/hgweb.py", line 701, in run chunk = f.read(4096) File "/usr/local/hg-0.6c/lib/python/mercurial/hg.py", line 1442, in read self.buf += self.g.next() File "/usr/local/hg-0.6c/lib/python/mercurial/hg.py", line 1469, in gengroup for y in self.manifest.group(linkmap): yield y File "/usr/local/hg-0.6c/lib/python/mercurial/revlog.py", line 433, in group chunks[r] = decompress(data[pos: pos + l]) File "/usr/local/hg-0.6c/lib/python/mercurial/revlog.py", line 33, in decompress if t == ''x'': return zlib.decompress(bin) MemoryError --> So the server ran out of memory trying to decompress a manifest. -- Mathematics is the supreme nostalgia of our time. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Hmm - What are you doing differently in 0.7 that is causing the server to use more memory? -Kip On 9/20/05, Matt Mackall <mpm@selenic.com> wrote:> > On Tue, Sep 20, 2005 at 06:07:34PM -0700, Kip Macy wrote: > > nifty - but 0.7 is not backward compatible with 0.6b: > > %hg clone http://xenbits.xensource.com/xen-unstable.hg > > requesting all changes > > adding changesets > > adding manifests > > adding file changes > > added 6917 changesets with 0 changes to 0 files > > ** unknown exception encountered, details follow > > ** report bug details to mercurial@selenic.com > > Not so hasty. The bug is in fact that xenbits is sometimes running out > of memory. Other times it works just fine. Here are the relevant bits > from my diagnosis this morning: > > ---- > > And then I added exception handling to the pull code, so that it now > does this: > > abort: premature EOF reading chunk (got 75478 bytes, expected > 1651992944)! > > That expected number says there''s probably something else in the > stream. Firing up Ethereal and tracing a connection shows: > > <!-- The above is a description of an error in a Python program, > formatted > for a Web browser because the ''cgitb'' module was enabled. In > case you > are not reading this in a Web browser, here is the original > traceback: > > Traceback (most recent call last): > File "/var/www/html/xen-unstable.hg", line 9, in ? > h.run() > File "/usr/local/hg-0.6c/lib/python/mercurial/hgweb.py", line 701, > in run > chunk = f.read(4096) > File "/usr/local/hg-0.6c/lib/python/mercurial/hg.py", line 1442, in > read > self.buf += self.g.next() > File "/usr/local/hg-0.6c/lib/python/mercurial/hg.py", line 1469, in > gengroup > for y in self.manifest.group(linkmap): yield y > File "/usr/local/hg-0.6c/lib/python/mercurial/revlog.py", line 433, > in group > chunks[r] = decompress(data[pos: pos + l]) > File "/usr/local/hg-0.6c/lib/python/mercurial/revlog.py", line 33, > in decompress > if t == ''x'': return zlib.decompress(bin) > MemoryError > > --> > > So the server ran out of memory trying to decompress a manifest. > > -- > Mathematics is the supreme nostalgia of our time. >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Tue, Sep 20, 2005 at 06:19:57PM -0700, Kip Macy wrote:> Hmm - > What are you doing differently in 0.7 that is causing the server to use more > memory?Nothing. Cloning a repo from scratch sends exactly the same command to the server in all versions ("send all changesets starting at the history root"). I think you''ve just got more load on xenbits. -- Mathematics is the supreme nostalgia of our time. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ahh - OK. It was just by chance that it failed the two times I used 0.7 and didn''t fail when I used 0.6b. -Kip On 9/20/05, Matt Mackall <mpm@selenic.com> wrote:> > On Tue, Sep 20, 2005 at 06:19:57PM -0700, Kip Macy wrote: > > Hmm - > > What are you doing differently in 0.7 that is causing the server to use > more > > memory? > > Nothing. Cloning a repo from scratch sends exactly the same command to the > server in all versions ("send all changesets starting at the history > root"). > > I think you''ve just got more load on xenbits. > > -- > Mathematics is the supreme nostalgia of our time. >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Matt Mackall wrote:> I think you''ve just got more load on xenbits.That was the case. The graphing library used by the xenrt stuff running on the same box had a very nasty memory leak. That''s been worked-around now so all should be well. I''m going to do some testing with 0.7 as both client and server and, all being well, upgrade xenbits. Cheers, James _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel