You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Lukas Ruf <ru...@rawip.org> on 2004/11/17 17:53:04 UTC
Subversion eating up all memory (again)
Dear all,
currently I am committing a merge of changes with Linux 2.6.9.
However, Subversion is eating up all my RAM -- see next:
top - 18:50:27 up 34 days, 22:47, 3 users, load average: 1.87, 1.96, 2.18
...
Mem: 1036680k total, 1030324k used, 6356k free, 64836k buffers
Swap: 996020k total, 995932k used, 88k free, 228196k cached
!!!!!
PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
23280 www-data 15 0 15280 7088 9260 S 1.3 0.7 0:13.23 apache2
336 root 15 0 0 0 0 S 0.3 0.0 0:44.25 kjournald
23327 ruf 15 0 1487m 572m 9588 D 0.3 56.6 0:58.65 svn
!!!!
Does anybody know what I can do against this problem?
Thanks for any help!
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Lukas Ruf <ru...@rawip.org>.
Jani,
> Jani Averbach <ja...@jaa.iki.fi> [2004-11-18 11:07]:
>
> On 2004-11-18 10:50+0100, Lukas Ruf wrote:
> >
> > The command run was:
> > svn commit -m "Patched Linux 2.6.8.1 -> 2.6.9"
> > run in the root of the Linux Kernel:
> > komsys-pc-ruf:2.6_trunk!62> du -hsc
> > 710M .
> > 710M total
>
> This is the total size of your working copy, the actual data size is
> roughly half of that, right?
>
That's right.
>
> Exactly, what does your post commit hook do? Could you try to commit
> without it? Then we can be sure that the problem is caused by it.
>
Of course I could try. If you have seen the other posting I sent
about 3 minutes ago, the question is: how?
Thanks.
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Jani Averbach <ja...@jaa.iki.fi>.
On 2004-11-18 10:50+0100, Lukas Ruf wrote:
>
> .................................................................svn: Commit failed (details follow):
> svn: MERGE request failed on '/svn/PromethOS/linux/2.6/trunk'
> svn: MERGE of '/svn/PromethOS/linux/2.6/trunk': timed out waiting for server
> (https://svn.XXXXXXXXXXXXXXXXXX)
>
> On that machine, I run the web-server for Subversion and tried to commit the
> changes after upgrading Linux Kernel from 2.6.8.1 to 2.6.9
>
This (the size) should not be a problem, I have made similar things on regular
basis, without problems.
> The command run was:
> svn commit -m "Patched Linux 2.6.8.1 -> 2.6.9"
> run in the root of the Linux Kernel:
> komsys-pc-ruf:2.6_trunk!62> du -hsc
> 710M .
> 710M total
This is the total size of your working copy, the actual data size is
roughly half of that, right?
> Could it be a problem that I have only one gigabyte of RAM,
This should not matter, because svn should use quite moderately memory
and we have tried to chop off runaway cases.
> try to commit the trunk changes on the same machine that runs the
> server, and my post-commit reports the changes?
Exactly, what does your post commit hook do? Could you try to commit
without it? Then we can be sure that the problem is caused by it.
BR, Jani
--
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Lukas Ruf <ru...@rawip.org>.
> Ben Collins-Sussman <su...@collab.net> [2004-11-17 19:21]:
>
>
> Yes, you can send a bug report with useful information:
>
> * what version of svn client? what version of server?
Debian unstable.
||/ Name Version Description
+++-==============-==============-============================================
ii subversion 1.0.9-2 Advanced version control system (aka. svn)
ii apache2 2.0.52-3 Next generation, scalable, extendable web se
> * what operation are you doing? show us the exact command.
>
.................................................................svn: Commit failed (details follow):
svn: MERGE request failed on '/svn/PromethOS/linux/2.6/trunk'
svn: MERGE of '/svn/PromethOS/linux/2.6/trunk': timed out waiting for server
(https://svn.XXXXXXXXXXXXXXXXXX)
On that machine, I run the web-server for Subversion and tried to commit the
changes after upgrading Linux Kernel from 2.6.8.1 to 2.6.9
The command run was:
svn commit -m "Patched Linux 2.6.8.1 -> 2.6.9"
run in the root of the Linux Kernel:
komsys-pc-ruf:2.6_trunk!62> du -hsc
710M .
710M total
Could it be a problem that I have only one gigabyte of RAM, try to
commit the trunk changes on the same machine that runs the server, and
my post-commit reports the changes?
Thanks for any hints!
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Ben Collins-Sussman <su...@collab.net>.
On Nov 17, 2004, at 11:53 AM, Lukas Ruf wrote:
> Dear all,
>
> currently I am committing a merge of changes with Linux 2.6.9.
> However, Subversion is eating up all my RAM -- see next:
>
> top - 18:50:27 up 34 days, 22:47, 3 users, load average: 1.87, 1.96,
> 2.18
> ...
> Mem: 1036680k total, 1030324k used, 6356k free, 64836k
> buffers
> Swap: 996020k total, 995932k used, 88k free, 228196k cached
> !!!!!
>
> PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
> 23280 www-data 15 0 15280 7088 9260 S 1.3 0.7 0:13.23 apache2
> 336 root 15 0 0 0 0 S 0.3 0.0 0:44.25 kjournald
> 23327 ruf 15 0 1487m 572m 9588 D 0.3 56.6 0:58.65 svn
> !!!!
>
> Does anybody know what I can do against this problem?
>
>
Yes, you can send a bug report with useful information:
* what version of svn client? what version of server?
* what operation are you doing? show us the exact command.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Lukas Ruf <ru...@rawip.org>.
> Simon Large <sl...@blazepoint.co.uk> [2004-11-18 11:52]:
>
> Lukas Ruf wrote:
> > komsys-pc-ruf:kernel!69> svn up
> > svn: Failed to add file 'kprobes.c': object of the same name
> > already exists
> >
> > komsys-pc-ruf:kernel!70> svn commit -m "Re-adding after time-out"
> > kprobes.c Adding kprobes.c
> > svn: Commit failed (details follow):
> > svn: File '/svn/PromethOS/linux/2.6/trunk/kernel/kprobes.c' already
> > exists
>
> Find out what is happening with kprobes.c.
>
> If it already existed in the repo then your local copy has somehow
> become unversioned.
>
> If it is a new file that you have just written and want to add, then it
> looks like someone else has beaten you to it and added it already. SVN
> will not overwrite an unversioned file with a versioned one because it
> might be destroying your data.
>
> Try renaming your local kprobes.c, do the update, then diff the files to
> find out who did what and when.
>
> This sometimes happens to me when I create a new file and send it as a
> patch. Someone else commits it, and then I can't update because I have
> an unversioned local file, and there is now one in the repo (mine!) with
> the same name.
>
I was the only user for sure.
I did first an update of my upstream tree.
Then merged in the changes of the upstream into the trunk.
Started the commit
That stopped with a timeout.
While waiting for the replies, I renamed trunk to _trunk and did a
HEAD checkout of the complete trunk.
komsys-pc-ruf:kernel!80> diff kprobes.c ../../_trunk/kernel/kprobes.c
komsys-pc-ruf:kernel!81>
No changes.
This looks to me as a similar problem I had already a couple of
weeks/months ago: changes get committed in the DB, however, local
status is not updated. It could, as Jani pointed out, be a problem of
my post-commit script:
#!/bin/sh
REPOS="$1"
REV="$2"
# modified
commitemail="commit-email.pl"
perl ${commitemail} "$REPOS" "$REV" \
-s '[svn] PromethOS:' \
lukas.ruf@lpr.ch &
Please note the ampersand '&' at the end of the command. I inserted
this based on a recommendation of this list.
If the problem is caused by the post-commit hook, I run into troubles
since these emails are required by the users.... I could imagine that
one way to avoid the problem would be that commit-email.pl would check
the size of the commit before starting the real procedure.
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Simon Large <sl...@blazepoint.co.uk>.
Lukas Ruf wrote:
> komsys-pc-ruf:kernel!69> svn up
> svn: Failed to add file 'kprobes.c': object of the same name
> already exists
>
> komsys-pc-ruf:kernel!70> svn commit -m "Re-adding after time-out"
> kprobes.c Adding kprobes.c
> svn: Commit failed (details follow):
> svn: File '/svn/PromethOS/linux/2.6/trunk/kernel/kprobes.c' already
> exists
Find out what is happening with kprobes.c.
If it already existed in the repo then your local copy has somehow
become unversioned.
If it is a new file that you have just written and want to add, then it
looks like someone else has beaten you to it and added it already. SVN
will not overwrite an unversioned file with a versioned one because it
might be destroying your data.
Try renaming your local kprobes.c, do the update, then diff the files to
find out who did what and when.
This sometimes happens to me when I create a new file and send it as a
patch. Someone else commits it, and then I can't update because I have
an unversioned local file, and there is now one in the repo (mine!) with
the same name.
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Lukas Ruf <ru...@rawip.org>.
> Garrett Rooney <ro...@electricjellyfish.net> [2004-11-18 17:36]:
>
> Lukas Ruf wrote:
>
> >I did: svn revert -R . && svn update but: Reverted
> >'drivers/i2c/i2c-dev.c' Reverted 'drivers/i2c/i2c-sensor-detect.c'
> >Reverted 'drivers/i2c/Makefile' svn: Failed to add file
> >'kernel/kprobes.c': object of the same name already exists
> >
> >
> >Hmmm, what next?
>
> Reverting the add of kernel/kprobes.c didn't actually delete the
> file, you'll have to remove it by hand, then rerun the update.
>
Since the changes were in the server already before. I simply moved
away the working copy and checked out the stuff again.
Thanks for your help!
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
Lukas Ruf wrote:
> I did:
> svn revert -R . && svn update
> but:
> Reverted 'drivers/i2c/i2c-dev.c'
> Reverted 'drivers/i2c/i2c-sensor-detect.c'
> Reverted 'drivers/i2c/Makefile'
> svn: Failed to add file 'kernel/kprobes.c': object of the same name
> already exists
>
>
> Hmmm, what next?
Reverting the add of kernel/kprobes.c didn't actually delete the file,
you'll have to remove it by hand, then rerun the update.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Lukas Ruf <ru...@rawip.org>.
Ben: thanks for the answer!
> Ben Collins-Sussman <su...@collab.net> [2004-11-18 15:28]:
>
> Lukas: the problem is that your commit *succeeded* in the server,
> but your client timed out waiting for the server to send back a
> detailed description of the files that changed. I saw that message
> in your previous mail.
>
> So you need to 'svn revert -R .' your working copy, 'svn update',
> and all will be fine again.
I did:
svn revert -R . && svn update
but:
Reverted 'drivers/i2c/i2c-dev.c'
Reverted 'drivers/i2c/i2c-sensor-detect.c'
Reverted 'drivers/i2c/Makefile'
svn: Failed to add file 'kernel/kprobes.c': object of the same name
already exists
Hmmm, what next?
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Ben Collins-Sussman <su...@collab.net>.
On Nov 18, 2004, at 4:06 AM, Lukas Ruf wrote:
>> Lukas Ruf <ru...@rawip.org> [2004-11-17 18:53]:
>>
>> currently I am committing a merge of changes with Linux 2.6.9.
>> However, Subversion is eating up all my RAM -- see next:
>>
>
> This morning, after sending the other report, I tried to re-commit the
> changes in a directory-after-directory way assuming this would consume
> that much memory. There, however, I run in the following problems:
>
> komsys-pc-ruf:kernel!67> svn stat
> ! .
> A + kprobes.c
> M rcupdate.c
> [...]
> M kmod.c
> M futex.c
>
> komsys-pc-ruf:kernel!68> svn commit -m "Re-adding after time-out"
> Sending kernel/Makefile
> svn: Commit failed (details follow):
> svn: Your file or directory 'Makefile' is probably out-of-date
> svn:
> The version resource does not correspond to the resource within the
> transaction. Either the requested version resource is out of date
> (needs to be updated), or the requested version resource is newer
> than the transaction root
> (restart the commit).
Lukas: the problem is that your commit *succeeded* in the server, but
your client timed out waiting for the server to send back a detailed
description of the files that changed. I saw that message in your
previous mail.
So now your working copy still has local edits, but if you try to
commit, they're all "out of date" (since the changes are already in the
server), and if you try to update your working copy, every file will
receive a conflicting change.
So you need to 'svn revert -R .' your working copy, 'svn update', and
all will be fine again.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Subversion eating up all memory (again)
Posted by Lukas Ruf <ru...@rawip.org>.
> Lukas Ruf <ru...@rawip.org> [2004-11-17 18:53]:
>
> currently I am committing a merge of changes with Linux 2.6.9.
> However, Subversion is eating up all my RAM -- see next:
>
This morning, after sending the other report, I tried to re-commit the
changes in a directory-after-directory way assuming this would consume
that much memory. There, however, I run in the following problems:
komsys-pc-ruf:kernel!67> svn stat
! .
A + kprobes.c
M rcupdate.c
[...]
M kmod.c
M futex.c
komsys-pc-ruf:kernel!68> svn commit -m "Re-adding after time-out"
Sending kernel/Makefile
svn: Commit failed (details follow):
svn: Your file or directory 'Makefile' is probably out-of-date
svn:
The version resource does not correspond to the resource within the
transaction. Either the requested version resource is out of date
(needs to be updated), or the requested version resource is newer
than the transaction root
(restart the commit).
komsys-pc-ruf:kernel!69> svn up
svn: Failed to add file 'kprobes.c': object of the same name already exists
komsys-pc-ruf:kernel!70> svn commit -m "Re-adding after time-out" kprobes.c
Adding kprobes.c
svn: Commit failed (details follow):
svn: File '/svn/PromethOS/linux/2.6/trunk/kernel/kprobes.c' already exists
What next?
wbr,
Lukas
--
Lukas Ruf | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org