72505 - upgrade CVS servers to 1.10.8 or later

Status: RESOLVED FIXED

(mozilla.org Graveyard :: Server Operations, task)

Description

[Dan Mosedale (:dmosedale, :dmose)]

As this should fix problem with the CVS server generating bogus paths that
mozilla developers run into all the time.

Comment 1

[Risto Kotalampi]

Moving to nobody.

Comment 2

[cls]

Risto!  

Leaf said that they (staff, lounge, someone, something) had all of the custom
patches that were applied to cvs.mozilla.org.  If this is the case, upgrading
should be a no brainer.  If someone will sneak me into B21, I'll do it on Wednesday.

Comment 3

[Risto Kotalampi]

IC can own this again.

Comment 4

[Risto Kotalampi]

We will work with Chris to make this happen. Latest version is 1.11.1p1 which is 
what I'd put with CVS_USER patches.

Comment 5

[Risto Kotalampi]

Hmmm, looking at 1.11.1p1 source code, and it seems like we might not need the 
patch because new versions have incorporated the feature we need (setting up 
CVS_USER variable correctly). Chris, could you verify?

server.c in 1.11.1p1:

#if HAVE_PUTENV
    /* Set LOGNAME, USER and CVS_USER in the environment, in case they
       are already set to something else.  */
    {
        char *env, *cvs_user;

        env = xmalloc (sizeof "LOGNAME=" + strlen (username));
        (void) sprintf (env, "LOGNAME=%s", username);
        (void) putenv (env);

        env = xmalloc (sizeof "USER=" + strlen (username));
        (void) sprintf (env, "USER=%s", username);
        (void) putenv (env);

        cvs_user = NULL != CVS_Username ? CVS_Username : "";
        env = xmalloc (sizeof "CVS_USER=" + strlen (cvs_user));
        (void) sprintf (env, "CVS_USER=%s", cvs_user);
        (void) putenv (env);
    }
#endif /* HAVE_PUTENV */

Comment 6

[Dan Mosedale (:dmosedale, :dmose)]

That sounds right; we bugged Jim Kingdon some more about this awhile ago and he
then landed the patch on the then-tip of CVS itself.  So this is probably the
result of that landing.

Comment 7

[Bradley Baetz (:bbaetz)]

Can someone please look into this? Its really really annoying everytime I forget
to diff a patch against cvs-mirror instead of cvs.

Comment 8

[jag (Peter Annema)]

So one problem I ran into with Myk today on cvs-mirror is that for new files
(diff -N), the path on the +++ line isn't the full path. Is this fixed in
versions newer than the one cvs-mirror is using?

Comment 9

[Risto Kotalampi]

ETA for the upgrade is 11/15/2001

Comment 10

[Myk Melez [:myk] [@mykmelez]]

Attachment: fixes patches of sub-directoried files made against old cvs servers

Comment 11

[Myk Melez [:myk] [@mykmelez]]

The Perl script I just attached fixes patches that are affected by a bug in our
cvs servers where the "+++" and "---" lines of unified diffs contain an
incomplete directory path to new files or files in sub-directories.  After
running the script on your patches, apply them with the "-p0" option to patch.

Syntax: 

fixpatch [filename...]

(Without a filename argument, the script reads from STDIN and writes to 
STDOUT.)

Examples:

fixpatch patchfile                  -> Fixes the patch file.
fixpatch patchfile1 patchfile2      -> Fixes both patch files.
cvs diff -u | fixpatch > patchfile  -> Saves the fixed patch into a file.

The script does not touch files that are already in the appropriate format. 
Patching a file creates a backup file with the ".orig" extension.

Comment 12

[Bradley Baetz (:bbaetz)]

Also see cvsdo.pl from http://www.red-bean.com/cvsutils/

Comment 13

[Myk Melez [:myk] [@mykmelez]]

The cvs clients on our other servers (gila, mothra, lounge, tegu) should be
upgraded to the same version at the same time.

Comment 14

[Myk Melez [:myk] [@mykmelez]]

Risto, what is the new date?

Comment 15

[Risto Kotalampi]

We're targeting for Friday 11/30 at 6pm PST. We can push clients to all systems 
same time to /opt/gnu/bin/cvs (and nuke all local modifications). If that 
Friday won't work then perhaps a week later (12/7/01).

Comment 16

[Myk Melez [:myk] [@mykmelez]]

To confirm, the plan is to upgrade the cvs servers located on the machines
thelizard and gila and to upgrade the cvs clients located on all machines
(thelizard, gila, lounge, mothra, tegu).

Friday, November 30 works for me.

Comment 17

[Risto Kotalampi]

Here's the draft plan (owner(s)):

a) notify CPD (seamonkey-internal) and mozilla developers. No later than       
   11/27/2001. (CPD/mozilla.org)
b) close the tree (mozilla.org). 
c) perform pre upgrade tests for reference (CPD/mozilla.org)
d) copy the repository to safe place so we can back out if necessary (IC)
e) copy the old "jail" so we can backout if necessary (IC)
f) replace the cvs binary (IC)
g) perform post upgrade tests (mozilla.org/CPD).

mozilla.org = myk?
CPD = granrose?

Any additions, comments?

Btw, I don't think we need conference call after all. Hopefully everything can 
be covered here.

Steve, have we verifed that all the patches in current version have been 
incorporated to 1.11.x?

Comment 18

[Jon Granrose]

I don't expect any problems, but just to ask the question: will this upgrade
cause any problems with interoperability with cvsserver.mcom.com?  This doesn't
require any client changes or the like, right?

Comment 19

[Risto Kotalampi]

Has the notifications to seamonkey-internal and mozilla.org lists/newsgroups
been sent? They should go out by COB today or this is off to next week.

Comment 20

[Stephen Brown]

We anticipate the upgrade to take an hour from IC standpoint: backup repository,
switch the binary, do our simple testing and turnover to mozilla organization
for further testing.  We'd like to reserve from 6pm to 7pm for our work.  If
mozilla organization needs to do any prep work or pre-testing please announce
the downtime appropriately as we'd like our part to begin at 6pm sharp...

We do not anticipate any negative impact or changes to be required on the
client side.  This should be a fairly straightforward upgrade.

Comment 21

[hacker formerly known as [e-mail]]

I just sent out the notice.  The tree & cvs server are scheduled to be shutdown
from 5:30p to 9:00p on Friday.

Comment 22

[Mike Kaply [:mkaply]]

Do we know if this fixes the "resurrecting dead files" problem?

(see bug http://bugzilla.mozilla.org/show_bug.cgi?id=76856)

Comment 23

[Risto Kotalampi]

Fixed 11/30/2001.