Re: locked out by partial cvsmerge
tis 2007-02-27 klockan 21:40 -0700 skrev Alex Rousskov:
Thanks for the explanation and snipped details. Unfortunately, it looks
like the problem is back and has even become worse as I see more locks
(from other developers) getting stuck now:
cvs rtag: [21:28:08] waiting for rousskov's lock in
/cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
cvs rtag: [21:28:38] waiting for serassio's lock in
/cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
cvs rtag: [21:29:08] waiting for amosjeffries's lock in
/cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
All seem to be gone now...
Do you know whether there is something going on with SourceForge that
increases the probability of these locks getting stuck? Anything we can
do about it in the short term?
It might actually be the cvsmerge script.. the following line isn't
exactly kind to CVS..
o Check if there is any pending changes in the repository
diffl=`eecvs -q rdiff -kk -r ${mergetag} -r ${mergefrom} ${module} | head | wc
-l`
probably should remove the head from there, letting the rdiff run to completion.
Regards
Henrik
signature.asc
Description: Detta är en digitalt signerad meddelandedel
Re: locked out by partial cvsmerge
ons 2007-02-28 klockan 13:01 +0800 skrev Adrian Chadd: I'm not sure to be honest; but do you think it'd be a good idea just to shift this development tree stuff back to a seperate repository or server over at TMF? It sounds like it'll be less of a headache now. The main reason why SF is used for this repository is security. The developer CVS repository is a scratchpad, and anyone who likes is given write access there if they want. - Separate server from the main repository. - Server not our maintenance problem. - Fully automated developer registration. - CVS is used because of legacy reasons only (i.e. the merge scripts written for CVS many years ago) But nothing says we must use the SF services, or even CVS. It would be quite nice if we would set up a public Bzr repository for example, or why not subversion as well. Account maintenance greatly simplified in both as no system account is needed. Regards Henrik signature.asc Description: Detta är en digitalt signerad meddelandedel
Re: locked out by partial cvsmerge
Henrik Nordstrom wrote:
tis 2007-02-27 klockan 21:40 -0700 skrev Alex Rousskov:
Thanks for the explanation and snipped details. Unfortunately, it looks
like the problem is back and has even become worse as I see more locks
(from other developers) getting stuck now:
cvs rtag: [21:28:08] waiting for rousskov's lock in
/cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
cvs rtag: [21:28:38] waiting for serassio's lock in
/cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
cvs rtag: [21:29:08] waiting for amosjeffries's lock in
/cvsroot/squid/squid3/lib/cppunit-1.10.0/doc
All seem to be gone now...
Do you know whether there is something going on with SourceForge that
increases the probability of these locks getting stuck? Anything we can
do about it in the short term?
It might actually be the cvsmerge script.. the following line isn't
exactly kind to CVS..
o Check if there is any pending changes in the repository
diffl=`eecvs -q rdiff -kk -r ${mergetag} -r ${mergefrom} ${module} | head | wc
-l`
probably should remove the head from there, letting the rdiff run to completion.
Is that a hint for us all to edit our copies of cvsmerge?
Regards
Henrik
Amos
Re: locked out by partial cvsmerge
tor 2007-03-01 klockan 01:25 +1300 skrev Amos Jeffries:
It might actually be the cvsmerge script.. the following line isn't
exactly kind to CVS..
o Check if there is any pending changes in the repository
diffl=`eecvs -q rdiff -kk -r ${mergetag} -r ${mergefrom} ${module} | head |
wc -l`
probably should remove the head from there, letting the rdiff run to
completion.
Is that a hint for us all to edit our copies of cvsmerge?
Remove the head part of the pipe.. (`| head`, or `head |`)
but I still have it in my copy..
Regards
Henrik
signature.asc
Description: Detta är en digitalt signerad meddelandedel
Re: locked out by partial cvsmerge
On Wed, 2007-02-28 at 10:35 +0100, Henrik Nordstrom wrote:
It might actually be the cvsmerge script.. the following line isn't
exactly kind to CVS..
o Check if there is any pending changes in the repository
diffl=`eecvs -q rdiff -kk -r ${mergetag} -r ${mergefrom} ${module} | head |
wc -l`
probably should remove the head from there, letting the rdiff run to
completion.
FWIW, I was able to merge after removing 'head'. Removing 'head' may
have nothing to do with merge success, but what a relief!
To speed things up, how about using the -s option with rdiff instead of
the 'head' trick:
If you use the -s option, no patch output is produced. Instead,
a summary of the changed or added files between the two releases
is sent to the standard output device. This is useful for find-
ing out, for example, which files have changed between two dates
or revisions.
Is it portable? Seems to be available on FreeBSD and Linux.
Thanks a lot,
Alex.
Re: locked out by partial cvsmerge
On Sat, 2007-02-24 at 08:43 +0100, Henrik Nordstrom wrote: These locks gets cleared automatically after a while and the lock is now gone. Thanks for the explanation and snipped details. Unfortunately, it looks like the problem is back and has even become worse as I see more locks (from other developers) getting stuck now: cvs rtag: [21:28:08] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc cvs rtag: [21:28:38] waiting for serassio's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc cvs rtag: [21:29:08] waiting for amosjeffries's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc I am unable to merge with HEAD (using cvsmerge) because of this. Do you know whether there is something going on with SourceForge that increases the probability of these locks getting stuck? Anything we can do about it in the short term? Thank you, Alex.
Re: locked out by partial cvsmerge
On Tue, Feb 27, 2007, Alex Rousskov wrote: On Sat, 2007-02-24 at 08:43 +0100, Henrik Nordstrom wrote: These locks gets cleared automatically after a while and the lock is now gone. Thanks for the explanation and snipped details. Unfortunately, it looks like the problem is back and has even become worse as I see more locks (from other developers) getting stuck now: cvs rtag: [21:28:08] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc cvs rtag: [21:28:38] waiting for serassio's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc cvs rtag: [21:29:08] waiting for amosjeffries's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc I am unable to merge with HEAD (using cvsmerge) because of this. Do you know whether there is something going on with SourceForge that increases the probability of these locks getting stuck? Anything we can do about it in the short term? I'm not sure to be honest; but do you think it'd be a good idea just to shift this development tree stuff back to a seperate repository or server over at TMF? It sounds like it'll be less of a headache now. Adrian
Re: locked out by partial cvsmerge
On Tue, Feb 27, 2007, Alex Rousskov wrote: On Sat, 2007-02-24 at 08:43 +0100, Henrik Nordstrom wrote: These locks gets cleared automatically after a while and the lock is now gone. Thanks for the explanation and snipped details. Unfortunately, it looks like the problem is back and has even become worse as I see more locks (from other developers) getting stuck now: cvs rtag: [21:28:08] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc cvs rtag: [21:28:38] waiting for serassio's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc cvs rtag: [21:29:08] waiting for amosjeffries's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc I am unable to merge with HEAD (using cvsmerge) because of this. Do you know whether there is something going on with SourceForge that increases the probability of these locks getting stuck? Anything we can do about it in the short term? I'm not sure to be honest; but do you think it'd be a good idea just to shift this development tree stuff back to a seperate repository or server over at TMF? It sounds like it'll be less of a headache now. Or we could call a 48+ hour holiday for any usage of HEAD and see if the locks disappear. Mine was either created 18 hours ago now or 36. For my part I'm going to stop-work until this gets fixed or someone else can run a full cvsmerge HEAD without encountering it. Amos PS. I had this crazy Idea, that if re-running a cvsmerge with all (3 now) of our logins at the same time would play leap-frog with the locks and move them across the code and away eventually. But then I'll bet cvs has been coded secure enough so that hack is impossible too.
locked out by partial cvsmerge
Hi there, I was running 'cvsmerge HEAD' from squid3-icap branch and got distracted. Meanwhile the internet connection went down. I am not sure where cvsmerge stopped, but it probably did not complete. If I try it again, I get: cvs rtag: [06:10:02] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc I tried to break my own lock, but, to my surprise, I get the same kind of result from cvs admin -u. It sounds like to break my lock, I need to obtain it first, which does not make sense to me: cvs admin: [23:22:56] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc FWIW, it is always the same directory that CVS gets stuck on. Do we have command-line access to SourceForge CVS so that the lock file can be manually removed? What should I do to unlock myself? Thank you, Alex.
Re: locked out by partial cvsmerge
On Fri, Feb 23, 2007, Alex Rousskov wrote: Do we have command-line access to SourceForge CVS so that the lock file can be manually removed? What should I do to unlock myself? Shell.sourceforge.net is currently busted for some reason. I wonder whats going on. adrian
Re: locked out by partial cvsmerge
Adrian Chadd wrote: On Fri, Feb 23, 2007, Alex Rousskov wrote: Do we have command-line access to SourceForge CVS so that the lock file can be manually removed? What should I do to unlock myself? Shell.sourceforge.net is currently busted for some reason. I wonder whats going on. oh, grrr. It looks like the rest of us are also blocked by that lock. I just tried to merge the latest changes down into my branch and it gives me the same warning/error. cvs rtag: [02:21:29] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc I had to abort after a 30sec loop displaying that error for 10 minutes. Amos
Re: locked out by partial cvsmerge
On Sat, 2007-02-24 at 15:33 +1300, Amos Jeffries wrote: Adrian Chadd wrote: On Fri, Feb 23, 2007, Alex Rousskov wrote: Do we have command-line access to SourceForge CVS so that the lock file can be manually removed? What should I do to unlock myself? Shell.sourceforge.net is currently busted for some reason. I wonder whats going on. oh, grrr. It looks like the rest of us are also blocked by that lock. I just tried to merge the latest changes down into my branch and it gives me the same warning/error. cvs rtag: [02:21:29] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc I had to abort after a 30sec loop displaying that error for 10 minutes. Ouch. FWIW, I can get to shell.sourceforge.net, but I do not want to create more problems experimenting and probably do not have write access to the right CVS files anyway. Let's hope somebody will fix this soon. Sorry, Alex.
Re: locked out by partial cvsmerge
fre 2007-02-23 klockan 16:30 -0700 skrev Alex Rousskov: Hi there, I was running 'cvsmerge HEAD' from squid3-icap branch and got distracted. Meanwhile the internet connection went down. I am not sure where cvsmerge stopped, but it probably did not complete. If I try it again, I get: cvs rtag: [06:10:02] waiting for rousskov's lock in /cvsroot/squid/squid3/lib/cppunit-1.10.0/doc These locks gets cleared automatically after a while and the lock is now gone. I tried to break my own lock, but, to my surprise, I get the same kind of result from cvs admin -u. It sounds like to break my lock, I need to obtain it first, which does not make sense to me CVS has two different kinds of locks. * edit locks, set/unset manually. Inherited from RCS but generally isn't used much in CVS or even meaningful in normal use of CVS. * repository file locks, automatic while it updates the repository. only the first category can be unlocked manually by using cvs admin. The second is there to protect the structure of the repository. Unfortunately sometimes when things go wrong a repository lock may be left around.. Unfortunately CVS is a bit dumb and does not deal with stale repository locks very well, but SourceForge automatically clears stale repository locks after a while (some hours). Regards Henrik signature.asc Description: Detta är en digitalt signerad meddelandedel
