Merge lp:~jpds/launchpad/timestamp-archivepublisher-run into lp:launchpad

[Jonathan Davies]

Changed cron.publish-ftpmaster and cron.publish-copy-archives to timestamp their trace files instead of just touching them.

[Jonathan Davies (jpds)]

= Summary =

The archivepublisher does not timestamp its trace files, it just touch'es the file. Mean while most of our mirrors timestamp when they synced with 'date -u' in their trace files:

- http://gb.archive.ubuntu.com/ubuntu/project/trace/?C=M;O=D

This branch changes this behaviour to mimic that of the mirrors.

[Julian Edwards (julian-edwards)]

Hi Jonathan

Thanks for doing the change. It would be great if you could add some explanatory text in comments as to why the trace file is needed, it's not obvious to most LP hackers.

The diff looks ok though. How are you going to test it? We could mkdir $ARCHIVEROOT/project/trace/ on dogfood and remove the "if [ "$LPCONFIG" = "$PRODUCTION_CONFIG" ]" check actually.

J

review: Needs Fixing

[Jonathan Davies (jpds)]

Mostly, trace files are very useful for debugging when a mirror was last updated or in this case the exact time the archivepublisher last ran.

[Julian Edwards (julian-edwards)]

Great, thanks.

review: Approve (code)

[Tim Penhey (thumper)]

review: Approve (release-critical)

=== modified file 'cronscripts/publishing/cron.publish-copy-archives'
--- cronscripts/publishing/cron.publish-copy-archives	2010-02-25 11:48:33 +0000
+++ cronscripts/publishing/cron.publish-copy-archives	2010-03-01 12:58:16 +0000
@@ -37,7 +37,7 @@
 LAUNCHPADROOT=/srv/launchpad.net/codelines/current
 LOCKFILE=/srv/launchpad.net/ubuntu-archive/cron.daily.lock
 DISTRONAME=ubuntu
-TOUCHLIST=$ARCHIVEROOT/project/trace/$(hostname --fqdn)
+TRACEFILE=$ARCHIVEROOT/project/trace/$(hostname --fqdn)
 
 # Manipulate the environment.
 export GNUPGHOME
@@ -76,9 +76,8 @@
     cp $OVERRIDEROOT/override.* $INDICES
 fi
 
-# Touch everything you asked us to do.
+# Timestamp our trace file to track when the last archive publisher run took
+# place.
 if [ "$LPCONFIG" = "$PRODUCTION_CONFIG" ]; then
-    for FILE in $TOUCHLIST; do
-      touch "$FILE"
-    done
+    date -u > "$TRACEFILE"
 fi
 
=== modified file 'cronscripts/publishing/cron.publish-ftpmaster'
--- cronscripts/publishing/cron.publish-ftpmaster	2009-06-24 20:52:01 +0000
+++ cronscripts/publishing/cron.publish-ftpmaster	2010-03-01 12:58:16 +0000
@@ -44,7 +44,7 @@
 LAUNCHPADROOT=/srv/launchpad.net/codelines/current
 LOCKFILE=/srv/launchpad.net/ubuntu-archive/cron.daily.lock
 DISTRONAME=ubuntu
-TOUCHLIST=$ARCHIVEROOT/project/trace/$(hostname --fqdn)
+TRACEFILE=$ARCHIVEROOT/project/trace/$(hostname --fqdn)
 DSYNCLIST=$CACHEROOT/dsync.list
 MD5LIST=$INDICES/md5sums.gz
 
@@ -194,11 +194,10 @@
 # fails.
 commercial-compat.sh || true
 
-# Touch everything you asked us to do.
+# Timestamp our trace file to track when the last archive publisher run took
+# place.
 if [ "$LPCONFIG" = "$PRODUCTION_CONFIG" ]; then
-    for FILE in $TOUCHLIST; do
-      touch "$FILE"
-    done
+    date -u > "$TRACEFILE"
 fi
 
 # Skip long-running processes when doing a quick security run.