You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Hyrum K Wright <hy...@hyrumwright.org> on 2012/12/04 03:23:41 UTC
trunk 'svn merge' takes a very long time to respond.
'svn merge' appears to hang when running a simple merge:
[[[
$ svnd merge ^/subversion/trunk/
^Csubversion/svn/util.c:913: (apr_err=4)
subversion/svn/merge-cmd.c:163: (apr_err=4)
subversion/libsvn_client/merge.c:11856: (apr_err=4)
subversion/libsvn_client/merge.c:11829: (apr_err=4)
subversion/libsvn_client/merge.c:9295: (apr_err=4)
subversion/libsvn_client/merge.c:9001: (apr_err=4)
subversion/libsvn_client/merge.c:8762: (apr_err=4)
subversion/libsvn_client/merge.c:8599: (apr_err=4)
subversion/libsvn_client/merge.c:6388: (apr_err=4)
subversion/libsvn_ra_serf/log.c:607: (apr_err=4)
subversion/libsvn_ra_serf/util.c:819: (apr_err=4)
subversion/libsvn_ra_serf/util.c:786: (apr_err=4)
svn: E000004: Error running context: Interrupted system call
$
]]]
This is using a trunk client build at r1416744 on Mac OS X. I also see the
same problem using a Linux client, same vintage. It was unresponsive for
something on the order of 5 minutes before I finally killed the process
with the above output.
I don't know enough about what's going on under the hood, but it appears
the serf is lost. None of my CPUs are pegged, though, so it looks like
it's just waiting on network? Hard to believe, as I've got a 15/5 fiber
connection.
Running it again, I start to get a response after 7 minutes. Something
strange going on here...
-Hyrum
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Dec 4, 2012 at 9:21 AM, Julian Foad <ju...@btopenworld.com> wrote:
>> $ svn mergeinfo .
>> youngest last repos.
>> common full tip of path of
>> ancestor merge branch branch
>>
>> 1416944 1416945
>> | |
>> -------| |------------ subversion/branches/fsfs-format7
>> \
>> \
>> --| |------------ subversion/branches/fsfs-format7
>> |
>> 1416944
>>
>> Julian, might want to look at this and why the mergeinfo output for
>> this brach seems ... not right.
>
> Hi Mark. That's because you requested mergeinfo about merges between source branch "." and target branch "implicit .".
>
> Now, I thought it was coded to error out in that case and say "You must specify two different but related branches", so I'll look into why it didn't.
OK. I had not tried the command in a while and I thought I recalled
that you did not need to supply any arguments. When I just ran svn
mergeinfo it gave me an error. Adding the "." gave the above output.
In this case, wouldn't it know the branch came from /subversion/trunk
without any help?
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Julian Foad <ju...@btopenworld.com>.
Mark Phippard wrote:
>
> $ svn mergeinfo .
> youngest last repos.
> common full tip of path of
> ancestor merge branch branch
>
> 1416944 1416945
> | |
> -------| |------------ subversion/branches/fsfs-format7
> \
> \
> --| |------------ subversion/branches/fsfs-format7
> |
> 1416944
>
> Julian, might want to look at this and why the mergeinfo output for
> this brach seems ... not right.
Hi Mark. That's because you requested mergeinfo about merges between source branch "." and target branch "implicit .".
Now, I thought it was coded to error out in that case and say "You must specify two different but related branches", so I'll look into why it didn't.
- Julian
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Mark Phippard <ma...@gmail.com>.
On Mon, Dec 3, 2012 at 9:23 PM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
> 'svn merge' appears to hang when running a simple merge:
I just tried it on one of our branches and did not see the problem. I
started getting response pretty immediately. Here is transcript:
$ svn mergeinfo .
youngest last repos.
common full tip of path of
ancestor merge branch branch
1416944 1416945
| |
-------| |------------ subversion/branches/fsfs-format7
\
\
--| |------------ subversion/branches/fsfs-format7
|
1416944
Julian, might want to look at this and why the mergeinfo output for
this brach seems ... not right.
$ time svn merge ^/subversion/trunk
--- Merging r1414756 through r1416947 into '.':
U Makefile.in
U subversion/libsvn_subr/cmdline.c
U subversion/libsvn_subr/properties.c
U subversion/libsvn_ra_local/ra_plugin.c
U subversion/bindings/swig/perl/native/Base.pm
U subversion/mod_dav_svn/repos.c
U subversion/mod_dav_svn/reports/inherited-props.c
U subversion/tests/libsvn_repos/repos-test.c
U subversion/tests/cmdline/svnlook_tests.py
U subversion/tests/cmdline/info_tests.py
U subversion/tests/cmdline/svntest/actions.py
U subversion/tests/cmdline/merge_tests.py
A subversion/svndumpfilter/svndumpfilter.c
U subversion/svn/props.c
U subversion/svn/cl.h
U subversion/svn/list-cmd.c
U subversion/svn/util.c
U subversion/svn/propget-cmd.c
U subversion/svn/log-cmd.c
A subversion/svn/svn.c
U subversion/svn/proplist-cmd.c
U subversion/svn/conflict-callbacks.c
U subversion/svn/schema/info.rnc
U subversion/svn/info-cmd.c
A subversion/svnversion/svnversion.c
A subversion/svnadmin/svnadmin.c
U subversion/include/svn_editor.h
U subversion/include/svn_repos.h
U subversion/include/svn_props.h
U subversion/include/svn_string.h
U subversion/include/svn_wc.h
U subversion/include/svn_client.h
U subversion/include/private/svn_cmdline_private.h
U subversion/libsvn_wc/props.c
U subversion/libsvn_wc/props.h
U subversion/libsvn_wc/diff_editor.c
U subversion/libsvn_wc/adm_ops.c
U subversion/libsvn_wc/conflicts.c
U subversion/libsvn_wc/update_editor.c
U subversion/libsvn_wc/translate.c
U subversion/libsvn_wc/wc-queries.sql
U subversion/libsvn_wc/wc_db_update_move.c
U subversion/libsvn_wc/wc_db.c
U subversion/libsvn_wc/diff_local.c
U subversion/libsvn_wc/wc_db.h
U subversion/libsvn_client/merge.c
U subversion/libsvn_client/prop_commands.c
U subversion/libsvn_client/mergeinfo.c
U subversion/libsvn_client/mergeinfo.h
U subversion/libsvn_client/add.c
A subversion/svnlook/svnlook.c
U subversion/libsvn_ra_serf/update.c
A subversion/svnsync/svnsync.c
U subversion/libsvn_repos/fs-wrap.c
U subversion/libsvn_delta/svndiff.c
U subversion/svnserve/serve.c
A subversion/svnserve/svnserve.c
U subversion/libsvn_fs_fs/tree.c
U tools/client-side/svn-bench/cl.h
A tools/client-side/svn-bench/svn-bench.c
U tools/client-side/svn-bench/null-list-cmd.c
U tools/server-side/svnauthz-validate.c
U tools/server-side/fsfs-reorg.c
A tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
U configure.ac
D tools/dev/svnraisetreeconflict/main.c
D tools/dev/gcov.patch
D tools/client-side/svn-bench/main.c
D subversion/svnserve/main.c
D subversion/svnsync/main.c
D subversion/svnlook/main.c
D subversion/svnadmin/main.c
D subversion/svnversion/main.c
D subversion/svn/main.c
D subversion/svndumpfilter/main.c
U .
--- Recording mergeinfo for merge of r1414756 through r1416947 into '.':
G .
real 1m19.426s
user 0m0.454s
sys 0m0.389s
$ svn --version --verbose
svn, version 1.8.0-dev (under development)
compiled Dec 4 2012, 08:58:02 on x86_64-apple-darwin11.4.2
Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
see the NOTICE file for more information.
Subversion is open source software, see http://subversion.apache.org/
The following repository access (RA) modules are available:
* ra_svn : Module for accessing a repository using the svn network protocol.
- with Cyrus SASL authentication
- handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
- handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
- handles 'http' scheme
- handles 'https' scheme
System information:
* running on x86_64-apple-darwin11.4.2
- Mac OS X 10.7.5 Lion, build 11G63
* linked dependencies:
- APR 1.4.6 (compiled with 1.4.6)
- APR-Util 1.4.1 (compiled with 1.4.1)
- SQLite 3.7.14.1 (compiled with 3.7.14.1)
* loaded shared libraries:
- /tmp/svn/bin/svn (Intel 64-bit)
- /tmp/svn/lib/libsvn_client-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_wc-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_diff-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra_local-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_repos-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs_fs-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs_base-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs_util-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra_svn-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libsasl2.2.dylib (Intel 64-bit)
- /usr/lib/libSystem.B.dylib (Intel 64-bit)
- /usr/lib/libresolv.9.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra_serf-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libserf-1.0.dylib (Intel 64-bit)
- /opt/local/lib/db46/libdb-4.6.dylib (Intel 64-bit)
- /opt/local/lib/libssl.1.0.0.dylib (Intel 64-bit)
- /opt/local/lib/libcrypto.1.0.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_delta-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_subr-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libz.1.dylib (Intel 64-bit)
- /opt/local/lib/libsqlite3.0.dylib (Intel 64-bit)
- /opt/local/lib/libaprutil-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libexpat.1.dylib (Intel 64-bit)
- /opt/local/lib/libapr-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libintl.8.dylib (Intel 64-bit)
- /opt/local/lib/libiconv.2.dylib (Intel 64-bit)
- /usr/lib/libauto.dylib (Intel 64-bit)
- /usr/lib/libDiagnosticMessagesClient.dylib (Intel 64-bit)
- /usr/lib/libicucore.A.dylib (Intel 64-bit)
- /usr/lib/libobjc.A.dylib (Intel 64-bit)
- /usr/lib/libz.1.dylib (Intel 64-bit)
- /usr/lib/libc++.1.dylib (Intel 64-bit)
- /usr/lib/libstdc++.6.dylib (Intel 64-bit)
- /usr/lib/libc++abi.dylib (Intel 64-bit)
- /usr/lib/libOpenScriptingUtil.dylib (Intel 64-bit)
- /usr/lib/libpam.2.dylib (Intel 64-bit)
- /usr/lib/libsqlite3.dylib (Intel 64-bit)
- /usr/lib/libbsm.0.dylib (Intel 64-bit)
- /usr/lib/libxar-nossl.dylib (Intel 64-bit)
- /usr/lib/libbz2.1.0.dylib (Intel 64-bit)
- /usr/lib/libxml2.2.dylib (Intel 64-bit)
- /usr/lib/libcrypto.0.9.8.dylib (Intel 64-bit)
- /usr/lib/liblangid.dylib (Intel 64-bit)
- /usr/lib/libCRFSuite.dylib (Intel 64-bit)
- /usr/lib/libxslt.1.dylib (Intel 64-bit)
- /opt/local/lib/sasl2/libanonymous.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libcrammd5.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libdigestmd5.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libgssapiv2.2.so (Intel 64-bit)
- /opt/local/lib/libgssapi_krb5.2.2.dylib (Intel 64-bit)
- /opt/local/lib/libkrb5.3.3.dylib (Intel 64-bit)
- /opt/local/lib/libk5crypto.3.1.dylib (Intel 64-bit)
- /opt/local/lib/libcom_err.3.0.dylib (Intel 64-bit)
- /opt/local/lib/libkrb5support.1.1.dylib (Intel 64-bit)
- /opt/local/lib/sasl2/liblogin.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libntlm.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libotp.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libplain.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libsasldb.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libscram.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libsrp.2.so (Intel 64-bit)
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Paul Burba <pt...@gmail.com>.
On Tue, Dec 4, 2012 at 7:35 PM, Stefan Fuhrmann
<st...@wandisco.com> wrote:
> On Wed, Dec 5, 2012 at 1:06 AM, Paul Burba <pt...@gmail.com> wrote:
>>
>> On Tue, Dec 4, 2012 at 10:48 AM, Paul Burba <pt...@gmail.com> wrote:
>> > On Tue, Dec 4, 2012 at 10:45 AM, Paul Burba <pt...@gmail.com> wrote:
>> >> On Tue, Dec 4, 2012 at 10:36 AM, Philip Martin
>> >> <ph...@wandisco.com> wrote:
>> >>> Mark Phippard <ma...@gmail.com> writes:
>> >>>
>> >>>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright
>> >>>> <hy...@hyrumwright.org> wrote:
>> >>>>
>> >>>>>> For your particular case, can you tell me what branch at what
>> >>>>>> revision
>> >>>>>> your merge target was?
>> >>>>>
>> >>>>>
>> >>>>> The merge target was the ev2-export branch, which was probably most
>> >>>>> recently
>> >>>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>> >>>>> reproduce, you could probably just back up the branch to before the
>> >>>>> most
>> >>>>> recent merge, and go from there.
>> >>>>
>> >>>> Using the current HEAD of that branch I can see the same problem.
>> >>>
>> >>> I don't see the problem when I use my local mirror or
>> >>> svn.eu.apache.org.
>> >>
>> >> Hmmm. Removing the one piece of subtree mergeinfo speeds things up
>> >> considerably:
>> >
>> > Which is because the delay somewhere in
>> > libsvn_client/merge.c:remove_noop_subtree_ranges(), which is a noop
>> > when there is only mergeinfo on the target itself.
>>
>> http://subversion.tigris.org/issues/show_bug.cgi?id=4269 describes the
>> problem. The slowness is ultimately attributable to running
>> svn_ra_get_log2 against 185k revisions. Still trying to come up with
>> a solution.
>
>
> Do my 1.8 improvements to "log -g" have any impact on this one?
Hi Stefan,
No, this is no about 'log -g', just "regular" log.
--
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
> -- Stefan^2.
>
>
> --
> Certified & Supported Apache Subversion Downloads:
>
> http://www.wandisco.com/subversion/download
>
>
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Stefan Fuhrmann <st...@wandisco.com>.
On Wed, Dec 5, 2012 at 1:06 AM, Paul Burba <pt...@gmail.com> wrote:
> On Tue, Dec 4, 2012 at 10:48 AM, Paul Burba <pt...@gmail.com> wrote:
> > On Tue, Dec 4, 2012 at 10:45 AM, Paul Burba <pt...@gmail.com> wrote:
> >> On Tue, Dec 4, 2012 at 10:36 AM, Philip Martin
> >> <ph...@wandisco.com> wrote:
> >>> Mark Phippard <ma...@gmail.com> writes:
> >>>
> >>>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <
> hyrum@hyrumwright.org> wrote:
> >>>>
> >>>>>> For your particular case, can you tell me what branch at what
> revision
> >>>>>> your merge target was?
> >>>>>
> >>>>>
> >>>>> The merge target was the ev2-export branch, which was probably most
> recently
> >>>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
> >>>>> reproduce, you could probably just back up the branch to before the
> most
> >>>>> recent merge, and go from there.
> >>>>
> >>>> Using the current HEAD of that branch I can see the same problem.
> >>>
> >>> I don't see the problem when I use my local mirror or
> svn.eu.apache.org.
> >>
> >> Hmmm. Removing the one piece of subtree mergeinfo speeds things up
> >> considerably:
> >
> > Which is because the delay somewhere in
> > libsvn_client/merge.c:remove_noop_subtree_ranges(), which is a noop
> > when there is only mergeinfo on the target itself.
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=4269 describes the
> problem. The slowness is ultimately attributable to running
> svn_ra_get_log2 against 185k revisions. Still trying to come up with
> a solution.
>
Do my 1.8 improvements to "log -g" have any impact on this one?
-- Stefan^2.
--
Certified & Supported Apache Subversion Downloads:
*
http://www.wandisco.com/subversion/download
*
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Paul Burba <pt...@gmail.com>.
On Tue, Dec 4, 2012 at 10:48 AM, Paul Burba <pt...@gmail.com> wrote:
> On Tue, Dec 4, 2012 at 10:45 AM, Paul Burba <pt...@gmail.com> wrote:
>> On Tue, Dec 4, 2012 at 10:36 AM, Philip Martin
>> <ph...@wandisco.com> wrote:
>>> Mark Phippard <ma...@gmail.com> writes:
>>>
>>>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>>>>
>>>>>> For your particular case, can you tell me what branch at what revision
>>>>>> your merge target was?
>>>>>
>>>>>
>>>>> The merge target was the ev2-export branch, which was probably most recently
>>>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>>>>> reproduce, you could probably just back up the branch to before the most
>>>>> recent merge, and go from there.
>>>>
>>>> Using the current HEAD of that branch I can see the same problem.
>>>
>>> I don't see the problem when I use my local mirror or svn.eu.apache.org.
>>
>> Hmmm. Removing the one piece of subtree mergeinfo speeds things up
>> considerably:
>
> Which is because the delay somewhere in
> libsvn_client/merge.c:remove_noop_subtree_ranges(), which is a noop
> when there is only mergeinfo on the target itself.
http://subversion.tigris.org/issues/show_bug.cgi?id=4269 describes the
problem. The slowness is ultimately attributable to running
svn_ra_get_log2 against 185k revisions. Still trying to come up with
a solution.
--
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Paul Burba <pt...@gmail.com>.
On Tue, Dec 4, 2012 at 10:45 AM, Paul Burba <pt...@gmail.com> wrote:
> On Tue, Dec 4, 2012 at 10:36 AM, Philip Martin
> <ph...@wandisco.com> wrote:
>> Mark Phippard <ma...@gmail.com> writes:
>>
>>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>>>
>>>>> For your particular case, can you tell me what branch at what revision
>>>>> your merge target was?
>>>>
>>>>
>>>> The merge target was the ev2-export branch, which was probably most recently
>>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>>>> reproduce, you could probably just back up the branch to before the most
>>>> recent merge, and go from there.
>>>
>>> Using the current HEAD of that branch I can see the same problem.
>>
>> I don't see the problem when I use my local mirror or svn.eu.apache.org.
>
> Hmmm. Removing the one piece of subtree mergeinfo speeds things up
> considerably:
Which is because the delay somewhere in
libsvn_client/merge.c:remove_noop_subtree_ranges(), which is a noop
when there is only mergeinfo on the target itself.
--
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Paul Burba <pt...@gmail.com>.
On Tue, Dec 4, 2012 at 10:36 AM, Philip Martin
<ph...@wandisco.com> wrote:
> Mark Phippard <ma...@gmail.com> writes:
>
>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>>
>>>> For your particular case, can you tell me what branch at what revision
>>>> your merge target was?
>>>
>>>
>>> The merge target was the ev2-export branch, which was probably most recently
>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>>> reproduce, you could probably just back up the branch to before the most
>>> recent merge, and go from there.
>>
>> Using the current HEAD of that branch I can see the same problem.
>
> I don't see the problem when I use my local mirror or svn.eu.apache.org.
Hmmm. Removing the one piece of subtree mergeinfo speeds things up
considerably:
C:\SVN\src-branch-ev2-export>svn pd svn:mergeinfo
tools\dist\make-deps-tarball.sh
property 'svn:mergeinfo' deleted from 'tools\dist\make-deps-tarball.sh'.
C:\SVN\src-branch-ev2-export>timethis svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Command Line : svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:43:48 2012
--- Merging r1416745 through r1416998 into '.':
U subversion\libsvn_wc\wc-queries.sql
U subversion\libsvn_wc\wc_db_update_move.c
--- Recording mergeinfo for merge of r1416745 through r1416998 into '.':
U .
TimeThis : Command Line : svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:43:48 2012
TimeThis : End Time : Tue Dec 04 10:43:56 2012
TimeThis : Elapsed Time : 00:00:07.541
--
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Philip Martin <ph...@wandisco.com>.
Mark Phippard <ma...@gmail.com> writes:
> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>
>>> For your particular case, can you tell me what branch at what revision
>>> your merge target was?
>>
>>
>> The merge target was the ev2-export branch, which was probably most recently
>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>> reproduce, you could probably just back up the branch to before the most
>> recent merge, and go from there.
>
> Using the current HEAD of that branch I can see the same problem.
I don't see the problem when I use my local mirror or svn.eu.apache.org.
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Paul Burba <pt...@gmail.com>.
On Tue, Dec 4, 2012 at 10:15 AM, Mark Phippard <ma...@gmail.com> wrote:
> On Tue, Dec 4, 2012 at 10:14 AM, Mark Phippard <ma...@gmail.com> wrote:
>> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>>
>>>> For your particular case, can you tell me what branch at what revision
>>>> your merge target was?
>>>
>>>
>>> The merge target was the ev2-export branch, which was probably most recently
>>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>>> reproduce, you could probably just back up the branch to before the most
>>> recent merge, and go from there.
>>
>> Using the current HEAD of that branch I can see the same problem.
>> Been several minutes and still no merge output. Interesting that I do
>> not see this same problem with the fsfs-format7 branch. I wonder what
>> is different? Subtree mergeinfo?
>
> Merge finished just as I hit Send:
>
> $ time svn merge ^/subversion/trunk
> --- Merging r1416745 through r1416980 into '.':
> U subversion/libsvn_wc/wc-queries.sql
> U subversion/libsvn_wc/wc_db_update_move.c
> --- Recording mergeinfo for merge of r1231319 through r1416980 into '.':
> U .
>
> real 3m46.879s
> user 0m0.228s
> sys 0m0.071s
>
> Did not see any of those notifications until the last 1 second. So it
> was about 3:45 of silence.
I see the same thing with trunk@1416985/serf1.1.1:
C:\SVN\src-branch-ev2-export>timethis svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Command Line : svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:27:15 2012
--- Merging r1416745 through r1416991 into '.':
U subversion\libsvn_wc\wc-queries.sql
U subversion\libsvn_wc\wc_db_update_move.c
--- Recording mergeinfo for merge of r1231319 through r1416991 into '.':
U .
TimeThis : Command Line : svn merge
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:27:15 2012
TimeThis : End Time : Tue Dec 04 10:30:32 2012
TimeThis : Elapsed Time : 00:03:16.998
Note that the equivalent cherry pick merge runs promptly:
C:\SVN\src-branch-ev2-export>svn revert -Rq .
C:\SVN\src-branch-ev2-export>timethis svn merge -r1416744:1416991
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Command Line : svn merge -r1416744:1416991
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:31:34 2012
--- Merging r1416745 through r1416991 into '.':
U subversion\libsvn_wc\wc-queries.sql
U subversion\libsvn_wc\wc_db_update_move.c
--- Recording mergeinfo for merge of r1416745 through r1416991 into '.':
U .
TimeThis : Command Line : svn merge -r1416744:1416991
https://svn.apache.org/repos/asf/subversion/trunk .
TimeThis : Start Time : Tue Dec 04 10:31:34 2012
TimeThis : End Time : Tue Dec 04 10:31:39 2012
TimeThis : Elapsed Time : 00:00:05.305
--
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Dec 4, 2012 at 10:14 AM, Mark Phippard <ma...@gmail.com> wrote:
> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>
>>> For your particular case, can you tell me what branch at what revision
>>> your merge target was?
>>
>>
>> The merge target was the ev2-export branch, which was probably most recently
>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
>> reproduce, you could probably just back up the branch to before the most
>> recent merge, and go from there.
>
> Using the current HEAD of that branch I can see the same problem.
> Been several minutes and still no merge output. Interesting that I do
> not see this same problem with the fsfs-format7 branch. I wonder what
> is different? Subtree mergeinfo?
Merge finished just as I hit Send:
$ time svn merge ^/subversion/trunk
--- Merging r1416745 through r1416980 into '.':
U subversion/libsvn_wc/wc-queries.sql
U subversion/libsvn_wc/wc_db_update_move.c
--- Recording mergeinfo for merge of r1231319 through r1416980 into '.':
U .
real 3m46.879s
user 0m0.228s
sys 0m0.071s
Did not see any of those notifications until the last 1 second. So it
was about 3:45 of silence.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <hy...@hyrumwright.org> wrote:
>> For your particular case, can you tell me what branch at what revision
>> your merge target was?
>
>
> The merge target was the ev2-export branch, which was probably most recently
> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To
> reproduce, you could probably just back up the branch to before the most
> recent merge, and go from there.
Using the current HEAD of that branch I can see the same problem.
Been several minutes and still no merge output. Interesting that I do
not see this same problem with the fsfs-format7 branch. I wonder what
is different? Subtree mergeinfo?
Here is mergeinfo on the branch
$ svn mergeinfo ^/subversion/trunk
youngest last repos.
common full tip of path of
ancestor merge branch branch
1231318 1416744 1416980
| | |
-------| |------------ subversion/trunk
\ \
\ \
--| |------------ subversion/branches/ev2-export
|
1416974
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Hyrum K Wright <hy...@hyrumwright.org>.
On Tue, Dec 4, 2012 at 8:53 AM, Julian Foad <ju...@btopenworld.com>wrote:
> Hyrum K Wright wrote:
>
> > 'svn merge' appears to hang when running a simple merge:
> >
> > [[[
> > $ svnd merge ^/subversion/trunk/
> > ^Csubversion/svn/util.c:913: (apr_err=4)
> > subversion/svn/merge-cmd.c:163: (apr_err=4)
> > subversion/libsvn_client/merge.c:11856: (apr_err=4)
> > subversion/libsvn_client/merge.c:11829: (apr_err=4)
> > subversion/libsvn_client/merge.c:9295: (apr_err=4)
> > subversion/libsvn_client/merge.c:9001: (apr_err=4)
> > subversion/libsvn_client/merge.c:8762: (apr_err=4)
> > subversion/libsvn_client/merge.c:8599: (apr_err=4)
> > subversion/libsvn_client/merge.c:6388: (apr_err=4)
> > subversion/libsvn_ra_serf/log.c:607: (apr_err=4)
> > subversion/libsvn_ra_serf/util.c:819: (apr_err=4)
> > subversion/libsvn_ra_serf/util.c:786: (apr_err=4)
> > svn: E000004: Error running context: Interrupted system call
> > ]]]
> >
> > This is using a trunk client build at r1416744 on Mac OS X. I also
> > see the same problem using a Linux client, same vintage. It was
> > unresponsive for something on the order of 5 minutes before I finally
> > killed the process with the above output.
>
>
> Hi Hyrum. I don't know if you're seeing a network/server problem or a
> client inefficiency or a bit of both. I have been thinking two things
> about the client merge code though:
>
> * It would be good to insert some feedback about what it's doing in the
> time before it starts making local changes, to give the user a more
> pleasant experience during a large merge.
>
> * I know there is room for optimization: at the moment, for example, I
> believe it calculates the youngest common ancestor of the two branches more
> than once (contacting the repository each time).
>
>
> I'll see if I can reproduce a "large" merge scenario where the start-up
> time is significant, and work out where the main bottleneck is.
>
> For your particular case, can you tell me what branch at what revision
> your merge target was?
>
The merge target was the ev2-export branch, which was probably most
recently merged around 2-3 weeks ago, so it's not incredibly out-of-date.
To reproduce, you could probably just back up the branch to before the
most recent merge, and go from there.
>
>
> > I don't know enough about what's going on under the hood, but it
> > appears the serf is lost. None of my CPUs are pegged, though, so it
> > looks like it's just waiting on network? Hard to believe, as I've
> > got a 15/5 fiber connection.
>
>
> It could easily be the server (or the network at the server end) that's
> responding slowly.
Yes, this thought crossed my mind as well. I was simultaneously running
the command on a Linux box and a Mac OS box, and the both started
responding at roughly the same time (though I started them both at the same
time).
-Hyrum
Re: trunk 'svn merge' takes a very long time to respond.
Posted by Julian Foad <ju...@btopenworld.com>.
Hyrum K Wright wrote:
> 'svn merge' appears to hang when running a simple merge:
>
> [[[
> $ svnd merge ^/subversion/trunk/
> ^Csubversion/svn/util.c:913: (apr_err=4)
> subversion/svn/merge-cmd.c:163: (apr_err=4)
> subversion/libsvn_client/merge.c:11856: (apr_err=4)
> subversion/libsvn_client/merge.c:11829: (apr_err=4)
> subversion/libsvn_client/merge.c:9295: (apr_err=4)
> subversion/libsvn_client/merge.c:9001: (apr_err=4)
> subversion/libsvn_client/merge.c:8762: (apr_err=4)
> subversion/libsvn_client/merge.c:8599: (apr_err=4)
> subversion/libsvn_client/merge.c:6388: (apr_err=4)
> subversion/libsvn_ra_serf/log.c:607: (apr_err=4)
> subversion/libsvn_ra_serf/util.c:819: (apr_err=4)
> subversion/libsvn_ra_serf/util.c:786: (apr_err=4)
> svn: E000004: Error running context: Interrupted system call
> ]]]
>
> This is using a trunk client build at r1416744 on Mac OS X. I also
> see the same problem using a Linux client, same vintage. It was
> unresponsive for something on the order of 5 minutes before I finally
> killed the process with the above output.
Hi Hyrum. I don't know if you're seeing a network/server problem or a client inefficiency or a bit of both. I have been thinking two things about the client merge code though:
* It would be good to insert some feedback about what it's doing in the time before it starts making local changes, to give the user a more pleasant experience during a large merge.
* I know there is room for optimization: at the moment, for example, I believe it calculates the youngest common ancestor of the two branches more than once (contacting the repository each time).
I'll see if I can reproduce a "large" merge scenario where the start-up time is significant, and work out where the main bottleneck is.
For your particular case, can you tell me what branch at what revision your merge target was?
> I don't know enough about what's going on under the hood, but it
> appears the serf is lost. None of my CPUs are pegged, though, so it
> looks like it's just waiting on network? Hard to believe, as I've
> got a 15/5 fiber connection.
It could easily be the server (or the network at the server end) that's responding slowly.
- Julian
> Running it again, I start to get a response after 7 minutes.
> Something strange going on here...