[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge error with SVN 1.8.0

From: Alexey Neyman <stilor_at_att.net>
Date: Fri, 28 Jun 2013 15:36:38 -0700

[copying dev@ because I found what the issue is]

Hi,

Did some further investigation and it turns out that SVN1.8 client creates more
connections to the server when performing 'svn merge' - exceeding the xinetd's
default number of connections per source (10) and indeed, closing the connection on
an unsuspecting client. After increasing the number of connections per source to
unlimited, the merge went through.

Here are some statistics:

SVN 1.7, merge --reintegrate
13 connections total, 5 concurrent connections maximum

SVN 1.8, merge
18 connections total, 11 concurrent connections maximum

SVN 1.8, merge --reintegrate
5 connections total, 3 concurrent connections maximum

So, it looks like the new code for automatic detection of "reintegration merges" in 1.8
spawns a bunch of additional connections. So, the question is - what is the maximum
number of connections that a client can create to a server? Does it depend on the size
of the change? Size of the svn:mergeinfo?

I am not comfortable leaving the server configuration at "unlimited", seeing that
xinetd limit is a safety net against runaway client bringing down the server.

Regards,
Alexey.

On Sunday, June 23, 2013 12:56:27 PM Alexey Neyman wrote:

Hi,

I've tried upgrading the client to SVN 1.8, and now see some strange merge errors
while reintegrating the branch. According to

  http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate

the --reintegrate option is now deprecated, its use is discouraged and SVN should be
able to figure that out automatically. However, when I tried a plain "svn merge", it
gave me the following error:

[aneyman_at_build2 trunk]$ svn merge ^/MERGE-PATH
svn: E210002: Unable to connect to a repository at URL 'svn://MERGE-URL'
svn: E210002: Network connection closed unexpectedly

Strangely, 'svn merge --reintegrate' worked fine.

We are running 1.6.11 on the server (stock RedHat RPM, "1.6.11-2.el6_1.4" version). I
installed SVN 1.8.0 RPM from WanDisco ("1.8.0-1") on the client.

Any clues/suggestions as to how to debug this further?

Regards,
Alexey.
Received on 2013-06-29 00:37:35 CEST

This is an archived mail posted to the Subversion Dev mailing list.