Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-22 Thread Junio C Hamano
Stefan Saasen ssaa...@atlassian.com writes: Anyway, long story short. We're interested to help but I'm not entirely sure what that would look like at the moment. Are there formed ideas floating around or would you be looking for some form of proposal instead? I am not proposing anything or

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Stefan Saasen ssaa...@atlassian.com writes: I've noticed Peff's patches on pu which suggest they will be available in git 2.5? Being on 'pu' (or 'next' for that matter) is not a suggestion for a change to appear in any future version at all, even

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-21 Thread Stefan Saasen
Perhaps companies like Atlassian that rely on the stability of the open source Git can spare some resources and join forces with like minded folks on LTS of older maintenance tracks, if they are truly interested in. We certainly can and would like to. I'm not entirely sure what that would

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-21 Thread Stefan Saasen
I've noticed Peff's patches on pu which suggest they will be available in git 2.5? Being on 'pu' (or 'next' for that matter) is not a suggestion for a change to appear in any future version at all, even though it often means that it would soon be merged to 'master' and will be in the

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-21 Thread Junio C Hamano
Stefan Saasen ssaa...@atlassian.com writes: I've noticed Peff's patches on pu which suggest they will be available in git 2.5? Being on 'pu' (or 'next' for that matter) is not a suggestion for a change to appear in any future version at all, even though it often means that it would soon be

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-20 Thread Stefan Saasen
If it is critical to some people, they can downmerge to their custom old installations of Git they maintain with ease, of course, and that with ease part is the reason why I try to apply fixes to tip of the original topic branch even though they were merged to the mainline eons ago ;-). I

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-20 Thread Jeff King
On Mon, Apr 20, 2015 at 01:04:11PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... But I don't know if this counts as critical (it is for you, certainly, but I don't think that many people are affected, as the crucial factor here is really the slow NFS filesystem

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: Either way, though, I do not think it is the upstream Git project's problem. The commit to pick where to queue the fixes actually is my problem, as I have this illusion that I'd be helping these derived works by making it easier for them to merge, not

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-20 Thread Jeff King
On Mon, Apr 20, 2015 at 01:12:54PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: Either way, though, I do not think it is the upstream Git project's problem. The commit to pick where to queue the fixes actually is my problem, as I have this illusion that I'd be helping

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-20 Thread Jeff King
On Sat, Apr 18, 2015 at 01:35:51PM +1000, Stefan Saasen wrote: Here are the timings for the two patches: [...] Thanks, that matches what I was hoping for. My tweaked version of your second patch is: [...] - return find_pack_entry(sha1, e) freshen_file(e.p-pack_name); + if

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-20 Thread Junio C Hamano
Jeff King p...@peff.net writes: ... But I don't know if this counts as critical (it is for you, certainly, but I don't think that many people are affected, as the crucial factor here is really the slow NFS filesystem operations). If it is critical to some people, they can downmerge to their

[BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-17 Thread Stefan Saasen
We became aware of slow merge times with the following setup: The merge is created in a temporary location that uses alternates. The temporary repository is on a local disk, the alternate object database on an NFS mount. After some investigation we believe that #33d4221 (present in git 2.2.0,

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-17 Thread Jeff King
On Fri, Apr 17, 2015 at 05:30:22PM +1000, Stefan Saasen wrote: The merge is created in a temporary location that uses alternates. The temporary repository is on a local disk, the alternate object database on an NFS mount. Is the alternate writeable? If we can't freshen the object, we fall

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-17 Thread Junio C Hamano
Jeff King p...@peff.net writes: If it's not a problem, I'd love to see timings for your case with just the first patch, and then with both. Thanks for two quick progress patches. You may also be interested in: http://thread.gmane.org/gmane.comp.version-control.git/266370 which

Re: [BUG] Performance regression due to #33d4221: write_sha1_file: freshen existing objects

2015-04-17 Thread Stefan Saasen
If it's not a problem, I'd love to see timings for your case with just the first patch, and then with both. Thanks for the swift response, much appreciated Jeff! Here are the timings for the two patches: Patch 1 on top of 33d4221c79 Elapsed System User Min.