X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=07e9b0d5671566f84e22ec36c19fb658f8397c3a;hb=f78bd8701c00ed40424df8cb9ca643f12319eea8;hp=7c763defb90a702e76b63aa60332385ad5347342;hpb=ad199e263b2538ddd32a6cb93284bb00eb959f51;p=dak.git diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 7c763def..07e9b0d5 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -1,7 +1,7 @@ #!/bin/bash # No way I try to deal with a crippled sh just for POSIX foo. -# Copyright (C) 2009 Joerg Jaspert +# Copyright (C) 2009-2012 Joerg Jaspert # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -27,6 +27,7 @@ # exit on errors set -e +set -o pipefail # make sure to only use defined variables set -u # ERR traps should be inherited from functions too. (And command @@ -35,7 +36,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 ######################################################################## @@ -72,7 +73,11 @@ function stage() { error=${ERR:-"true"} - STAGEFILE="${stagedir}/${FUNC}" + ARGS=${ARGS:-""} + + log "########## DINSTALL BEGIN: ${FUNC} ${ARGS} ##########" + STAGEFILE="${stagedir}/${FUNC}_${ARGS}" + STAGEFILE=${STAGEFILE// /_} if [ -f "${STAGEFILE}" ]; then stamptime=$(/usr/bin/stat -c %Z "${STAGEFILE}") unixtime=$(date +%s) @@ -129,6 +134,8 @@ function stage() { cat "${STAGEFILE}.log" >> "${LOGFILE}" rm -f "${STAGEFILE}.log" + log "########## DINSTALL END: ${FUNC} ##########" + if [ -f "${LOCK_STOP}" ]; then log "${LOCK_STOP} exists, exiting immediately" exit 42 @@ -159,7 +166,7 @@ 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}" @@ -172,7 +179,7 @@ GO=( stage $GO GO=( - FUNC="merkel1" + FUNC="qa1" TIME="init" ARGS="" ERR="false" @@ -180,9 +187,9 @@ GO=( stage $GO & GO=( - FUNC="pgdump_pre" + FUNC="pg_timestamp" TIME="pg_dump1" - ARGS="" + ARGS="predinstall" ERR="" ) stage $GO @@ -193,46 +200,50 @@ GO=( ARGS="" ERR="false" ) -stage $GO & +stage $GO GO=( - FUNC="punew" - TIME="p-u-new" - ARGS="p-u-new" - ERR="" + FUNC="i18n1" + TIME="i18n 1" + ARGS="" + ERR="false" ) -### TODO: policy-new -#stage $GO +stage $GO GO=( - FUNC="opunew" - TIME="o-p-u-new" - ARGS="o-p-u-new" - ERR="" + FUNC="dep11" + TIME="dep11 1" + ARGS="" + ERR="false" ) -### TODO: policy-new -#stage $GO +stage $GO + +lockfile "$LOCK_ACCEPTED" +trap remove_all_locks EXIT TERM HUP INT QUIT GO=( - FUNC="i18n1" - TIME="i18n 1" - ARGS="" + FUNC="punew" + TIME="p-u-new" + ARGS="stable-new" ERR="false" ) -stage $GO & +stage $GO -lockfile "$LOCK_ACCEPTED" -lockfile "$LOCK_NEW" +GO=( + FUNC="opunew" + TIME="o-p-u-new" + ARGS="oldstable-new" + ERR="false" +) +stage $GO GO=( - FUNC="process_unchecked" - TIME="unchecked" + FUNC="backports_policy" + TIME="backports-policy" ARGS="" - ERR="" + ERR="false" ) -# disabled until p-u is faster than now. it runs often enough, so wont hurt to save -# the time here. -#stage $GO +stage $GO GO=( FUNC="cruft" @@ -242,9 +253,6 @@ GO=( ) stage $GO -rm -f "$LOCK_ACCEPTED" -rm -f "$LOCK_NEW" - state "indices" GO=( @@ -256,9 +264,9 @@ GO=( stage $GO GO=( - FUNC="filelist" - TIME="generate-filelist" - ARGS="" + FUNC="autocruft" + TIME="autocruft" + ARGS="unstable experimental" ERR="" ) stage $GO @@ -269,7 +277,7 @@ GO=( ARGS="" ERR="false" ) -stage $GO & +stage $GO GO=( FUNC="overrides" @@ -285,7 +293,7 @@ GO=( ARGS="" ERR="false" ) -stage $GO & +stage $GO state "packages/contents" GO=( @@ -294,8 +302,6 @@ GO=( 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/" @@ -308,24 +314,24 @@ GO=( stage $GO GO=( - FUNC="release" - TIME="release files" + FUNC="gitpdiff" + TIME="gitpdiff" ARGS="" ERR="" ) -stage $GO +#stage $GO GO=( - FUNC="dakcleanup" - TIME="cleanup" + FUNC="release" + TIME="release files" ARGS="" ERR="" ) stage $GO GO=( - FUNC="buildd_dir" - TIME="buildd_dir" + FUNC="dakcleanup" + TIME="cleanup" ARGS="" ERR="" ) @@ -380,38 +386,47 @@ GO=( ) stage $GO -rm -f "${LOCK_DAILY}" +GO=( + FUNC="ddaccess" + TIME="ddaccessible sync" + ARGS="" + ERR="false" +) +stage $GO + +remove_all_locks +trap - EXIT TERM HUP INT QUIT ts "locked part finished" state "postlock" GO=( - FUNC="pgdump_post" - TIME="pg_dump2" + FUNC="changelogs" + TIME="changelogs" ARGS="" - ERR="" + ERR="false" ) stage $GO & GO=( - FUNC="expire" - TIME="expire_dumps" - ARGS="" + FUNC="pg_timestamp" + TIME="pg_dump2" + ARGS="postdinstall" ERR="" ) -stage $GO & +stage $GO GO=( - FUNC="transitionsclean" - TIME="transitionsclean" + FUNC="expire" + TIME="expire_dumps" ARGS="" ERR="" ) stage $GO & GO=( - FUNC="reports" - TIME="reports" + FUNC="transitionsclean" + TIME="transitionsclean" ARGS="" ERR="" ) @@ -434,16 +449,16 @@ GO=( stage $GO & GO=( - FUNC="merkel2" - TIME="merkel projectb push" + FUNC="mirrorpush" + TIME="mirrorpush" ARGS="" ERR="false" ) stage $GO & GO=( - FUNC="mirrorpush" - TIME="mirrorpush" + FUNC="mirrorpush-backports" + TIME="mirrorpush-backports" ARGS="" ERR="false" ) @@ -476,37 +491,16 @@ stage $GO & rm -f "${LOCK_BRITNEY}" GO=( - FUNC="pgdakdev" - TIME="dak-dev db" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="merkel3" - TIME="merkel ddaccessible sync" - ARGS="" - ERR="false" -) -stage $GO & - -GO=( - FUNC="compress" - TIME="compress" + FUNC="cleantransactions" + TIME="" ARGS="" ERR="" ) -stage $GO & - -GO=( - FUNC="aptftpcleanup" - TIME="apt-ftparchive cleanup" - ARGS="" - ERR="false" -) 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