Minor cvs problem (I hope)

Minor cvs problem (I hope)

[Geoffrey Keating]

I got:

cvs [server aborted]: unable to reopen 
`/cvs/gcc/gcc/gcc/testsuite/g++.dg/gcov/Attic/gcov-1.x,v'

On inspection, I found:

[geoffk@sourceware ~]$ ls -al /cvs/gcc/gcc/gcc/testsuite/g++.dg/gcov/
total 80
drwxrwsr-x    3 janis    gcc          4096 May 13 21:07 .
drwxrwsr-x   27 jason    gcc          4096 May 13 21:07 ..
drwxrwsr-x    2 janis    gcc          4096 Jan 17 06:03 CVS
-r--r--r--    1 mmitchel gcc         17348 May 13 20:36 gcov-1.C,v
-r--r--r--    1 mmitchel gcc          9207 May 13 20:36 gcov-2.C,v
-r--r--r--    1 mmitchel gcc          9090 May 13 20:36 gcov-3.C,v
-r--r--r--    1 mmitchel gcc          8955 May 13 20:36 gcov-3.h,v
-r--r--r--    1 mmitchel gcc         10093 May 13 20:36 gcov.exp,v
[geoffk@sourceware ~]$ ls -al 
/cvs/gcc/gcc/gcc/testsuite/g++.dg/gcov/CVS/
total 12
drwxrwsr-x    2 janis    gcc          4096 Jan 17 06:03 .
drwxrwsr-x    3 janis    gcc          4096 May 13 21:07 ..
-rw-rw-r--    1 anoncvs  gcc           182 Apr  9 19:28 fileattr
[geoffk@sourceware ~]$ cat 
/cvs/gcc/gcc/gcc/testsuite/g++.dg/gcov/CVS/fileattr
Fgcov-1.C       _head=1.2;_expand=
Fgcov-1.x       _head=1.2;_expand=;_attic=
Fgcov-2.C       _head=1.1;_expand=
Fgcov-3.C       _head=1.1;_expand=
Fgcov-3.h       _head=1.1;_expand=
Fgcov.exp       _head=1.1;_expand=

so I did

[geoffk@sourceware ~]$ rm 
/cvs/gcc/gcc/gcc/testsuite/g++.dg/gcov/CVS/fileattr

and hopefully that'll fix it temporarily.  However, we're still missing 
a gcov-1.x file, which must have existed at some point because there's 
this ChangeLog entry:

2003-03-27  Mark Mitchell  <mark@codesourcery.com>

         * lib/gcov.exp (run-gcov): Add branches and calls options, 
rather
         than reading .x files.
         * g++.dg/gcov/gcov-1.C: Use run-gcov options, not .x files.
         * g77.dg/gcov/gcov-1.f: Likewise.
         * gcc.misc-tests/gcov-4b.c: Likewise.
         * gcc.misc-tests/gcov-5b.c: Likewise.
         * gcc.misc-tests/gcov-6.c: Likewise.
         * gcc.misc-tests/gcov-7.c: Likewise.
         * gcc.misc-tests/gcov-8.c: Likewise.
         * g++.dg/gcov/gcov-1.x: Remove.
         * g77.dg/gcov/gcov-1.x: Likewise.
         * gcc.misc-tests/gcov-4b.x: Likewise.
         * gcc.misc-tests/gcov-5b.x: Likewise.
         * gcc.misc-tests/gcov-6.x: Likewise.
         * gcc.misc-tests/gcov-7.x: Likewise.
         * gcc.misc-tests/gcov-8.x: Likewise.

and this one:

2002-03-29  Janis Johnson  <janis187@us.ibm.com>

         * g++.dg/dg.exp: Ignore tests in new directories bprob and gcov.
         * g++.dg/bprob/bprob.exp: New driver for profile-directed branch
         ordering tests.
         * g++.dg/bprob/bprob-1.C: New test.
         * g++.dg/gcov/gcov.exp: New driver for gcov tests.
         * g++.dg/gcov/gcov-1.C: New test.
         * g++.dg/gcov/gcov-1.x: New file.
         * g++.dg/gcov/gcov-2.C: New test.
         * g++.dg/gcov/gcov-3.C: New test.
         * g++.dg/gcov/gcov-3.h: New file.

I am quite concerned at the prospect of having CVS randomly delete 
files.  That should not ever happen.

I should have a backup of this RCS file, I will restore it tonight.

-- 
Geoff Keating <geoffk@apple.com>

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

Overseers,

I talked to Geoff about this in more detail and am comparing
current state against my backups to see just how many files have
been deleted.  At least two Attic directories have disappeared.
Don't know yet whether this is isolated to just gcc or not.

Stay tuned

--Angela

Re: Minor cvs problem (I hope)

[Mark Mitchell]

On Tue, 2003-05-13 at 14:29, Angela Marie Thomas wrote:
> 
> 
> Overseers,
> 
> I talked to Geoff about this in more detail and am comparing
> current state against my backups to see just how many files have
> been deleted.  At least two Attic directories have disappeared.
> Don't know yet whether this is isolated to just gcc or not.
> 
> Stay tuned

This is plausibly my fault somehow; I interrupted a CVS operation due to
a bug in the GCC release script.

Any idea when those can be restored?

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[Ian Lance Taylor]

Mark Mitchell <mark@codesourcery.com> writes:

> > I talked to Geoff about this in more detail and am comparing
> > current state against my backups to see just how many files have
> > been deleted.  At least two Attic directories have disappeared.
> > Don't know yet whether this is isolated to just gcc or not.
> > 
> > Stay tuned
> 
> This is plausibly my fault somehow; I interrupted a CVS operation due to
> a bug in the GCC release script.
> 
> Any idea when those can be restored?

Interrupting a CVS operation could not cause an Attic directory to
completely disappear.

Ian

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 02:29:11PM -0700, Angela Marie Thomas wrote:
>I talked to Geoff about this in more detail and am comparing
>current state against my backups to see just how many files have
>been deleted.  At least two Attic directories have disappeared.
>Don't know yet whether this is isolated to just gcc or not.
>
>Stay tuned

Hmm.  Maybe we'd better turn off cvs access.

cgf

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

Quick look shows 34 Attic dirs missing in the gcc tree.  I'm
generating a complete difference of files now, but it will take
some time.

Since my backups are nightly (most recent from 02:30-03:00 today),
there's a risk of lost data if I restore Attic files that were
updated after that.  Since this happened about an hour ago, I don't
know if we have anything more recent than that or not.

--Angela

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 02:45:04PM -0700, Angela Marie Thomas wrote:
>Quick look shows 34 Attic dirs missing in the gcc tree.  I'm
>generating a complete difference of files now, but it will take
>some time.
>
>Since my backups are nightly (most recent from 02:30-03:00 today),
>there's a risk of lost data if I restore Attic files that were
>updated after that.  Since this happened about an hour ago, I don't
>know if we have anything more recent than that or not.

I tried to force an fsck on reboot but it "didn't take", so I shut
down some services and ran an fsck on /sourceware/projects.  There
were no failures.

The system is back up now but cvs access is still off.

cgf

Re: Minor cvs problem (I hope)

[Mark Mitchell]

On Tue, 2003-05-13 at 14:45, Angela Marie Thomas wrote:
> 
> Quick look shows 34 Attic dirs missing in the gcc tree.  I'm
> generating a complete difference of files now, but it will take
> some time.

I think I know what happened here -- and it is my fault.

The CVS server got stuck when I interrupted an cvs rtag operation, due
to stale lock directories.

I logged in to attempt to fix it (by removing my lock directories), but
must have done something incredibly fatfingered which resulted in
removing these Attic directories as well.

Fine work, indeed, on my part.

What can I do to help fix the problem -- other than keep my dang hands
off the machine?

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> What can I do to help fix the problem -- other than keep my dang hands
> off the machine?

If you have scrollback or history from what you did, we can reconstruct what
happened and only restore what we have to.

I counted 34 missing Attic dirs.  Do you know if this might extend beyond
Attic dirs?

--Angela

Re: Minor cvs problem (I hope)

[Mark Mitchell]

On Tue, 2003-05-13 at 15:00, Angela Marie Thomas wrote:
> 
> > What can I do to help fix the problem -- other than keep my dang hands
> > off the machine?
> 
> If you have scrollback or history from what you did, we can reconstruct what
> happened and only restore what we have to.

I don't -- but I know what I tried to do:

  find . -type d -user mmitchel -name \#cvs.lock 

I suspect that I somehow scrogged the last bit and got *all* directories
owned by me.  I bet that all of those are Attic directories because I
haven't created very many brand-new directories.

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> I don't -- but I know what I tried to do:
> 
>   find . -type d -user mmitchel -name \#cvs.lock 
> 
> I suspect that I somehow scrogged the last bit and got *all* directories
> owned by me.  I bet that all of those are Attic directories because I
> haven't created very many brand-new directories.

Okie dokie.  I'm trying to see what all is missing and with the above I can
also see what iles/dirs in the gcc respository are owned by you and missing.

Chris, do you want to email the lists to tell them what's up?  I don't know
how long this will take.  Will try to get an estimate soon.

--Angela

Re: Minor cvs problem (I hope)

[Mark Mitchell]

> Chris, do you want to email the lists to tell them what's up?  I don't know
> how long this will take.  Will try to get an estimate soon.

Do we have to go to tape, or is there a mirror we can copy from?

Angela, do you have a favorite beer or equivalent?

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 03:50:40PM -0700, Mark Mitchell wrote:
>> Chris, do you want to email the lists to tell them what's up?  I don't know
>> how long this will take.  Will try to get an estimate soon.
>
>Do we have to go to tape, or is there a mirror we can copy from?

Can we get the stuff that was mirrored on subversions.gnu.org somehow?
I don't know who to contact for that.

Hmm.  I've turned off rsync so that they won't accidentally end up mirroring
our broken setup.

cgf

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> Can we get the stuff that was mirrored on subversions.gnu.org somehow?
> I don't know who to contact for that.
> 
> Hmm.  I've turned off rsync so that they won't accidentally end up mirroring
> our broken setup.

If they mirror often enough, they may already have it.  Do you know how
often or when the last time was they took a snapshot?

--Angela

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 04:04:47PM -0700, Angela Marie Thomas wrote:
>
>> Can we get the stuff that was mirrored on subversions.gnu.org somehow?
>> I don't know who to contact for that.
>> 
>> Hmm.  I've turned off rsync so that they won't accidentally end up mirroring
>> our broken setup.
>
>If they mirror often enough, they may already have it.  Do you know how
>often or when the last time was they took a snapshot?

May 13 22:44:52 sourceware rsyncd[21530]: rsync on gcc-cvs from subversions.gnu.org (199.232.41.2) 

It's now Tue May 13 23:18:13 UTC 2003, so I assume I closed the barn door
too late, right?

cgf

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> May 13 22:44:52 sourceware rsyncd[21530]: rsync on gcc-cvs from subversions.g
nu.org (199.232.41.2) 
> 
> It's now Tue May 13 23:18:13 UTC 2003, so I assume I closed the barn door
> too late, right?

Yup.  Geoff told me he starting seeing the problem at 13:30 PDT which would
have been 20:30 UTC.

--Angela

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 04:18:06PM -0700, Angela Marie Thomas wrote:
>
>> May 13 22:44:52 sourceware rsyncd[21530]: rsync on gcc-cvs from subversions.g
>nu.org (199.232.41.2) 
>> 
>> It's now Tue May 13 23:18:13 UTC 2003, so I assume I closed the barn door
>> too late, right?
>
>Yup.  Geoff told me he starting seeing the problem at 13:30 PDT which would
>have been 20:30 UTC.

Hmm.  Isn't this:

http://savannah.gnu.org/cgi-bin/viewcvs/gcc/gcc/gcc/testsuite/g%2B%2B.dg/gcov/gcov-1.C

one of the missing files?

Do you think that the FSF is rsyncing without deleting the files?  Could we
be that lucky?

Does anyone have a contact at gnu.org who could conceivably get us this file?

cgf

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> http://savannah.gnu.org/cgi-bin/viewcvs/gcc/gcc/gcc/testsuite/g%2B%2B.dg/gcov
/gcov-1.C
> 
> one of the missing files?

No, Attic/gcov-1.x,v

--Angela

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 04:30:41PM -0700, Angela Marie Thomas wrote:
>
>> http://savannah.gnu.org/cgi-bin/viewcvs/gcc/gcc/gcc/testsuite/g%2B%2B.dg/gcov
>/gcov-1.C
>> 
>> one of the missing files?
>
>No, Attic/gcov-1.x,v

Oh well.  Should I turn on CVS again?

cgf

Re: Minor cvs problem (I hope)

[Phil Edwards]

On Tue, May 13, 2003 at 07:29:29PM -0400, Christopher Faylor wrote:
> On Tue, May 13, 2003 at 04:18:06PM -0700, Angela Marie Thomas wrote:
> >
> >> May 13 22:44:52 sourceware rsyncd[21530]: rsync on gcc-cvs from subversions.g
> >nu.org (199.232.41.2) 
> >> 
> >> It's now Tue May 13 23:18:13 UTC 2003, so I assume I closed the barn door
> >> too late, right?
> >
> >Yup.  Geoff told me he starting seeing the problem at 13:30 PDT which would
> >have been 20:30 UTC.

I did an rsync at 14:40 EDT, 18:40 UTC, if that helps any.  But I use
--delete, so...  *shrug*.


Phil

-- 
If ye love wealth greater than liberty, the tranquility of servitude greater
than the animating contest for freedom, go home and leave us in peace.  We seek
not your counsel, nor your arms.  Crouch down and lick the hand that feeds you;
and may posterity forget that ye were our countrymen.            - Samuel Adams

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> I did an rsync at 14:40 EDT, 18:40 UTC, if that helps any.  But I use
> --delete, so...  *shrug*.

For grins, you could compare your rsync of those files to what I had.
~angela/mmdel.tar.gz  is what I restored.  14:40 EDT may be early
enough to have missed the delete.

--Angela

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

I've restored all the files that seem to have been affected.  The list
of dirs under /sourceware/projects that were deleted and restored is:
    gcc-home/cvsfiles/gcc/gcc/config/fx80/Attic
    gcc-home/cvsfiles/gcc/gcc/config/gmicro/Attic
    gcc-home/cvsfiles/gcc/gcc/config/ns32k/Attic
    gcc-home/cvsfiles/gcc/gcc/config/pyr/Attic
    gcc-home/cvsfiles/gcc/gcc/config/spur/Attic
    gcc-home/cvsfiles/gcc/gcc/config/tahoe/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g77.dg/gcov/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.dg/abi/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.dg/expr/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.dg/gcov/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.dg/init/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.dg/overload/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.dg/parse/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.old-deja/g++.gb/Attic
    gcc-home/cvsfiles/gcc/gcc/testsuite/g++.old-deja/g++.other/Attic
    gcc-home/cvsfiles/gcc/libchill/Attic
    gcc-home/cvsfiles/gcc/libio/dbz/Attic
    gcc-home/cvsfiles/gcc/libio/include/Attic
    gcc-home/cvsfiles/gcc/libio/stdio/Attic
    gcc-home/cvsfiles/gcc/libio/tests/Attic
    gcc-home/cvsfiles/gcc/libio/testsuite/Attic
    gcc-home/cvsfiles/gcc/libio/testsuite/config/Attic
    gcc-home/cvsfiles/gcc/libio/testsuite/lib/Attic
    gcc-home/cvsfiles/gcc/libio/testsuite/libio.tests/Attic
    gcc-home/cvsfiles/gcc/libstdc++/config/Attic
    gcc-home/cvsfiles/gcc/libstdc++/std/Attic
    gcc-home/cvsfiles/gcc/libstdc++/tests/Attic
    gcc-home/cvsfiles/gcc/libstdc++/testsuite/Attic
    gcc-home/cvsfiles/gcc/libstdc++/testsuite/config/Attic
    gcc-home/cvsfiles/gcc/libstdc++/testsuite/lib/Attic
    gcc-home/cvsfiles/gcc/libstdc++/testsuite/libstdc++.tests/Attic
    gcc-home/cvsfiles/gcc/libstdc++-v3/config/cpu/generic/bits/Attic
    gcc-home/cvsfiles/gcc/libstdc++-v3/config/cpu/i386/bits/Attic
    gcc-home/cvsfiles/gcc/libstdc++-v3/config/os/windiss

This is a little less than 400 files.

These are the files as of ~03:00 PDT (~10:00 UTC) so any changes that
happened this morning are likely lost.  I think most of the files aren't
affected, but am concerned about the libstdc++-v3/config/os/windiss files.

--Angela

Re: Minor cvs problem (I hope)

[Mark Mitchell]

> These are the files as of ~03:00 PDT (~10:00 UTC) so any changes that
> happened this morning are likely lost.  I think most of the files aren't
> affected, but am concerned about the libstdc++-v3/config/os/windiss files.

We will check those -- but I believe there have been no changes there.

Thanks!!

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> > These are the files as of ~03:00 PDT (~10:00 UTC) so any changes that
> > happened this morning are likely lost.  I think most of the files aren't
> > affected, but am concerned about the libstdc++-v3/config/os/windiss files.
> 
> We will check those -- but I believe there have been no changes there.

Geoff checked the gcc commit mailing list and it looks like there
were no commits to any of those files.  The only data that could
be missing then would be from tags.  I don't think that is an issue
since you're likely the only one tagging right now.

Can you please send email to the appropriate gcc lists so folks know
things should be OK now?  Pretty sure Chris is turning on CVS as I type.

--Angela

Re: Minor cvs problem (I hope)

[Phil Edwards]

On Tue, May 13, 2003 at 04:43:36PM -0700, Angela Marie Thomas wrote:
> 
> > > These are the files as of ~03:00 PDT (~10:00 UTC) so any changes that
> > > happened this morning are likely lost.  I think most of the files aren't
> > > affected, but am concerned about the libstdc++-v3/config/os/windiss files.
> > 
> > We will check those -- but I believe there have been no changes there.
> 
> Geoff checked the gcc commit mailing list and it looks like there
> were no commits to any of those files.

We haven't touched windiss in quite a while; all good.

-- 
If ye love wealth greater than liberty, the tranquility of servitude greater
than the animating contest for freedom, go home and leave us in peace.  We seek
not your counsel, nor your arms.  Crouch down and lick the hand that feeds you;
and may posterity forget that ye were our countrymen.            - Samuel Adams

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> Do we have to go to tape, or is there a mirror we can copy from?

I do an rsync mirror of sourceware every night so it should be fairly quick
once I identify all the files (almost done with that).  Since Attic dirs
were deleted, I think I also have to restore files which would have been
moved to the Attic.  I think it's only a couple.

> Angela, do you have a favorite beer or equivalent?

Mmmmm stout.  O:-)

--Angela

Re: Minor cvs problem (I hope)

[Mark Mitchell]

> > Angela, do you have a favorite beer or equivalent?
> 
> Mmmmm stout.  O:-)

If you send me a snail-mail address, I will send some your way.

I am extremely grateful for your extremely fast work.

And from now on, I will just let the cvs operations complete, no matter
how long they take.

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[Angela Marie Thomas]

> If you send me a snail-mail address, I will send some your way.

How about buying me a pint at the gcc summit meeting?

> I am extremely grateful for your extremely fast work.

NP.  The whole point of my backups is for something just like this.

> And from now on, I will just let the cvs operations complete, no matter
> how long they take.

Good plan.  O:-)

--Angela

Re: Minor cvs problem (I hope)

[Mark Mitchell]

On Tue, 2003-05-13 at 16:46, Angela Marie Thomas wrote:
> 
> > If you send me a snail-mail address, I will send some your way.
> 
> How about buying me a pint at the gcc summit meeting?

Done.  Please make yourself obvious.

> > And from now on, I will just let the cvs operations complete, no matter
> > how long they take.
> 
> Good plan.  O:-)

Yeah, no kidding.

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Re: Minor cvs problem (I hope)

[law]

In message <20030513234621.99674E3A24@foam.wonderslug.com>, Angela Marie Thomas
 writes:
 >
 >> If you send me a snail-mail address, I will send some your way.
 >
 >How about buying me a pint at the gcc summit meeting?
I wasn't aware you were going to the summit.  I'll buy a pint for you
as well....


Jeff

Re: Minor cvs problem (I hope)

[Christopher Faylor]

On Tue, May 13, 2003 at 08:51:58PM -0600, law@redhat.com wrote:
>In message <20030513234621.99674E3A24@foam.wonderslug.com>, Angela Marie Thomas
>writes:
>>
>>>If you send me a snail-mail address, I will send some your way.
>>
>>How about buying me a pint at the gcc summit meeting?
>I wasn't aware you were going to the summit.  I'll buy a pint for you
>as well....

I'm going too.  Sounds like it will be quite a pahty (as they say around
here).

cgf

Re: Minor cvs problem (I hope)

[Phil Edwards]

On Tue, May 13, 2003 at 11:06:52PM -0400, Christopher Faylor wrote:
> On Tue, May 13, 2003 at 08:51:58PM -0600, law@redhat.com wrote:
> >In message <20030513234621.99674E3A24@foam.wonderslug.com>, Angela Marie Thomas
> >writes:
> >>
> >>>If you send me a snail-mail address, I will send some your way.
> >>
> >>How about buying me a pint at the gcc summit meeting?
> >I wasn't aware you were going to the summit.  I'll buy a pint for you
> >as well....
> 
> I'm going too.  Sounds like it will be quite a pahty (as they say around
> here).

The crusty veteran sysadmins will be easy to spot: we'll be clustered
around one table, sharing war stories, drinking heavily and twitching.

-- 
If ye love wealth greater than liberty, the tranquility of servitude greater
than the animating contest for freedom, go home and leave us in peace.  We seek
not your counsel, nor your arms.  Crouch down and lick the hand that feeds you;
and may posterity forget that ye were our countrymen.            - Samuel Adams