X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=27200dd109aa4cb22838defa247ff240ceaeeae0;hb=15a944c0f60ff8464b57b9532be660214a3a6bbc;hp=03bb364874951f4709cd6520a3448c535b4adcf6;hpb=b1d87e4799aa00b3544cd70d3cb185c055827c70;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 03bb3648..27200dd1 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -35,7 +35,7 @@ set -u
 set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ########################################################################
@@ -154,10 +154,12 @@ export LC_ALL=C
 
 touch "${DINSTALLSTART}"
 ts "startup"
+DINSTALLBEGIN="$(date -u +"%a %b %d %T %Z %Y (%s)")"
+state "Startup"
 
 lockfile -l 3600 "${LOCK_DAILY}"
 trap onerror ERR
-trap cleanup EXIT TERM HUP INT QUIT
+trap remove_daily_lock EXIT TERM HUP INT QUIT
 
 touch "${LOCK_BRITNEY}"
 
@@ -170,7 +172,7 @@ GO=(
 stage $GO
 
 GO=(
-    FUNC="merkel1"
+    FUNC="qa1"
     TIME="init"
     ARGS=""
     ERR="false"
@@ -178,9 +180,9 @@ GO=(
 stage $GO &
 
 GO=(
-    FUNC="pgdump_pre"
+    FUNC="pg_timestamp"
     TIME="pg_dump1"
-    ARGS=""
+    ARGS="predinstall"
     ERR=""
 )
 stage $GO
@@ -191,44 +193,43 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
+
+GO=(
+    FUNC="i18n1"
+    TIME="i18n 1"
+    ARGS=""
+    ERR="false"
+)
+stage $GO
+
+lockfile "$LOCK_ACCEPTED"
+lockfile "$LOCK_NEW"
+trap remove_all_locks EXIT TERM HUP INT QUIT
 
 GO=(
     FUNC="punew"
     TIME="p-u-new"
-    ARGS="p-u-new"
-    ERR=""
+    ARGS="proposedupdates"
+    ERR="false"
 )
-### TODO: policy-new
-#stage $GO
+stage $GO
 
 GO=(
     FUNC="opunew"
     TIME="o-p-u-new"
-    ARGS="o-p-u-new"
-    ERR=""
-)
-### TODO: policy-new
-#stage $GO
-
-GO=(
-    FUNC="i18n1"
-    TIME="i18n 1"
-    ARGS=""
+    ARGS="oldproposedupdates"
     ERR="false"
 )
-stage $GO &
-
-lockfile "$LOCK_ACCEPTED"
-lockfile "$LOCK_NEW"
+stage $GO
 
 GO=(
-    FUNC="process_unchecked"
-    TIME="unchecked"
+    FUNC="newstage"
+    TIME="newstage"
     ARGS=""
     ERR=""
 )
-#stage $GO
+stage $GO
 
 GO=(
     FUNC="cruft"
@@ -238,12 +239,11 @@ GO=(
 )
 stage $GO
 
-rm -f "$LOCK_ACCEPTED"
-rm -f "$LOCK_NEW"
+state "indices"
 
 GO=(
-    FUNC="msfl"
-    TIME="make-suite-file-list"
+    FUNC="dominate"
+    TIME="dominate"
     ARGS=""
     ERR=""
 )
@@ -263,7 +263,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -281,14 +281,18 @@ GO=(
 )
 stage $GO
 
+state "packages/contents"
 GO=(
     FUNC="packages"
     TIME="apt-ftparchive"
     ARGS=""
     ERR=""
 )
+# Careful: When we ever go and remove this monster-long thing, we have to check the backgrounded
+# functions before it. We no longer have a 1.5hour sync point then.
 stage $GO
 
+state "dists/"
 GO=(
     FUNC="pdiff"
     TIME="pdiff"
@@ -321,6 +325,7 @@ GO=(
 )
 stage $GO
 
+state "scripts"
 GO=(
     FUNC="mkmaintainers"
     TIME="mkmaintainers"
@@ -329,6 +334,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="mkuploaders"
+    TIME="mkuploaders"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="copyoverrides"
     TIME="copyoverrides"
@@ -369,25 +382,27 @@ GO=(
 )
 stage $GO
 
+remove_all_locks
+trap - EXIT TERM HUP INT QUIT
+
+ts "locked part finished"
+state "postlock"
+
 GO=(
-    FUNC="wb"
-    TIME="w-b"
+    FUNC="changelogs"
+    TIME="changelogs"
     ARGS=""
-    ERR=""
+    ERR="false"
 )
 stage $GO &
 
-rm -f "${LOCK_DAILY}"
-
-ts "locked part finished"
-
 GO=(
-    FUNC="pgdump_post"
+    FUNC="pg_timestamp"
     TIME="pg_dump2"
-    ARGS=""
+    ARGS="postdinstall"
     ERR=""
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="expire"
@@ -405,14 +420,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="reports"
-    TIME="reports"
-    ARGS=""
-    ERR=""
-)
-stage $GO &
-
 GO=(
     FUNC="dm"
     TIME=""
@@ -429,21 +436,13 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="merkel2"
-    TIME="merkel projectb push"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="mirrorpush"
     TIME="mirrorpush"
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
 GO=(
     FUNC="i18n2"
@@ -451,7 +450,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
+stage $GO &
 
 GO=(
     FUNC="stats"
@@ -467,33 +466,25 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO
-
-rm -f ${LOCK_BRITNEY}
-
-GO=(
-    FUNC="pgdakdev"
-    TIME="dak-dev db"
-    ARGS=""
-    ERR="false"
-)
 stage $GO &
 
+rm -f "${LOCK_BRITNEY}"
+
 GO=(
-    FUNC="merkel3"
-    TIME="merkel ddaccessible sync"
+    FUNC="ddaccess"
+    TIME="ddaccessible sync"
     ARGS=""
     ERR="false"
 )
 stage $GO &
 
 GO=(
-    FUNC="compress"
-    TIME="compress"
+    FUNC="cleantransactions"
+    TIME=""
     ARGS=""
     ERR=""
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="aptftpcleanup"
@@ -503,6 +494,9 @@ GO=(
 )
 stage $GO
 
+# we need to wait for the background processes before the end of dinstall
+wait
+
 log "Daily cron scripts successful, all done"
 
 exec > "$logdir/afterdinstall.log" 2>&1
@@ -514,6 +508,7 @@ GO=(
     ERR="false"
 )
 stage $GO
+state "all done"
 
 
 # Now, at the very (successful) end of dinstall, make sure we remove