X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=62ec9a1ed8f47d08dd3959b9f56a50b0fb482359;hp=61559515c04620b0b1c45f09ee6ba22a422ca0b3;hb=c10e027383c48f1be6e431de2f316d70c2ca2292;hpb=adcc4dcadd87c31ca52c4ec6b485375b56579e46 diff --git a/config/debian/common b/config/debian/common old mode 100644 new mode 100755 index 61559515..62ec9a1e --- a/config/debian/common +++ b/config/debian/common @@ -3,93 +3,213 @@ # # Set $PROGRAM to a string to have it added to the output. function log () { - local prefix=${PROGRAM:-} - echo "$(date +"%b %d %H:%M:%S") $(hostname -s) ${prefix}[$$]: $@" + local prefix=${PROGRAM:-} + echo "$(date +"%b %d %H:%M:%S") ${HOSTNAME} ${prefix}[$$]: $*" } # log the message using log() but then also send a mail # to the address configured in MAILTO (if non-empty) function log_error () { - log "$@" - if [ -z "${MAILTO}" ]; then - echo "$@" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@$(hostname -s)] ERROR [$$]" ${MAILTO} -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org - fi + log "$@" + if [[ -z ${MAILTO} ]]; then + echo "$*" | mail -a "X-Debian: DAK" -e -s "[$PROGRAM@${HOSTNAME}] ERROR [$$]" -a "From: Debian FTP Masters " ${MAILTO} + fi } # debug log, only output when DEBUG=1 function debug () { - if [ $DEBUG -eq 1 ]; then + if [[ $DEBUG -eq 1 ]]; then log "$*" fi } +# Get a tempfile, add it to the right variable to get rid of it, +# and return it +function gettempfile() { + local MAKEDIR=${1:-false} + local TMPARGS="" + if [[ ${MAKEDIR} == true ]]; then + TMPARGS="--directory" + fi + local TMPFILE=$( mktemp -p ${TMPDIR} ${TMPARGS} ) + TMPFILES="${TEMPFILES} ${TMPFILE}" + echo "${TMPFILE}" +} + +# Function that only cleans tempfiles, but does not exit or otherwise +# care about any exit status +function cleantempfiles() { + resolvetmpfiles + for TEMPFILE in $TMPFILES; do + if [[ -n ${TEMPFILE} ]] && [[ -f ${TEMPFILE} ]]; then + rm -f "${TEMPFILE}" + elif [[ -n ${TEMPFILE} ]] && [[ -d ${TEMPFILE} ]]; then + if [[ ${TEMPFILE} != / ]] && [[ ${TEMPFILE} != /* ]]; then + rm -rf "${TEMPFILE}" + fi + fi + done + TMPFILES="" +} + +function resolvetmpfiles() { + # If you don't understand this better not touch the script + for TEMPFILE in $TEMPFILES; do + TMPFILES="${TMPFILES} ${!TEMPFILE:-""}" + done + TEMPFILES="" +} + +# Function cleanup +# No arguments +# Cleans up any known tempfile. +# Just ensure your script sets the variable +# TEMPFILES to the names of variables of tempfiles +# Or TMPFILES to the pathes of tempfiles +function cleanup() { + ERRVAL=$? + trap - ERR EXIT TERM HUP INT QUIT + + cleantempfiles + + return $ERRVAL +} +TEMPFILES=${TEMPFILES:-""} +TMPFILES=${TMPFILES:-""} + +# Timestamp. Used for dinstall stat graphs +function ts() { + echo "Archive maintenance timestamp ($1): $(date +%H:%M:%S)" +} + +######################################################################## +######################################################################## + function wbtrigger() { - SSHOPT="-o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" + SSHOPT="-n -o BatchMode=yes -o ConnectTimeout=30 -o SetupTimeout=240" if lockfile -r 3 -l 3600 "${LOCK_BUILDD}"; then - ssh -q -q ${SSHOPT} wbadm@buildd /org/wanna-build/trigger.often + ssh -q -q ${SSHOPT} wbadm@buildd /srv/wanna-build/trigger.often fi rm -f "${LOCK_BUILDD}" } # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { + # We generate straight into the static mirror location for incoming + log "Preparing buildd area" dak manage-build-queues -a + dak generate-packages-sources2 -a build-queues + dak generate-releases -a build-queues >/dev/null - for dist in $(ls -1 ${incoming}/dists/); do - # Skip project trace directory - if [ "${dist}x" = "projectx" ]; then continue; fi - cd ${incoming}/dists/${dist} - mkdir -p tree/${STAMP} - cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/ - ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current - find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf - done + # Stick a last modified date in the page footer + echo "

Last updated: $(date -u)

" > ${incoming}/web/README.html + # Tell the mirrors that we've updated + log "Pushing static for incoming.d.o" + chronic /usr/local/bin/static-update-component incoming.debian.org < /dev/null +} + +# Process (oldstable)-proposed-updates "NEW" queue +function punew_do() { + local queue="$1" + local qdir="$2" + local to="${3}" + + date -u -R >> REPORT + dak process-policy "${queue}" | tee -a REPORT | mail -a "X-Debian: DAK" -e -s "NEW changes in ${queue}" -a "From: Debian FTP Masters " "${to}" + echo >> REPORT + + dak generate-packages-sources2 -s "${queue}" + + STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} + + local exportdir="${qdir}/tree/${STAMP}" + local targetdir="${qdir}/export" + mkdir -p -- ${exportdir} + dak export -q "${queue}" -d "${exportdir}" --all + ln -sfT ${exportdir} ${targetdir} + find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf +} + +# These versions used in dinstall +function punew() { + log "Doing automated p-u-new processing" + cd "${queuedir}/p-u-new" + punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org" +} + +function opunew() { + log "Doing automated o-p-u-new processing" + cd "${queuedir}/o-p-u-new" + punew_do "$1" "${queuedir}/o-p-u-new" "debian-release@lists.debian.org" +} + +function backports_policy() { + local queue="backports-policy" + local qdir="/srv/backports-master.debian.org/queue/policy" + local to="backports-team@debian.org" + + log "Doing automated ${queue} processing" + + cd "${qdir}" + punew_do "${queue}" "${qdir}" "${to}" } # Do the unchecked processing, in case we have files. function do_unchecked () { cd $unchecked - changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) - report=$queuedir/REPORT + changes=$(find . -maxdepth 1 -mindepth 1 -type f \( -name \*.changes -o -name \*.dak-commands \) | sed -e "s,./,," | xargs) + report=${queuedir}/REPORT timestamp=$(date "+%Y-%m-%d %H:%M") - UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""} - echo "$timestamp": ${changes:-"Nothing to do"} >> $report - dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report + if [[ ! -z ${changes} ]]; then + log "Processing files ${changes}" + { + echo "${timestamp}: ${changes}" + dak process-upload -a -d "$unchecked" + dak process-commands -d "$unchecked" + } >> ${report} + + sync_debbugs + do_buildd + else + log "Nothing to do" + echo "Nothing to do" >> ${report} + fi } -# Do the newstage processing, in case we have files. -function do_newstage () { - cd $newstage +# process NEW policy queue +function do_new () { + log "Doing NEW processing" + (dak process-policy new; dak process-policy byhand) | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND processing" -a "From: Debian FTP Masters " ftpmaster@ftp-master.debian.org - changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) - report=$queuedir/REPORT - timestamp=$(date "+%Y-%m-%d %H:%M") - UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""} + log "Processing Backports NEW" + dak process-policy backports-new | mail -a "X-Debian: DAK" -e -s "NEW processing for backports-new" -a "From: Debian FTP Masters " backports-team@debian.org - echo "$timestamp": ${changes:-"Nothing to do in newstage"} >> $report - dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$newstage" >> $report + log "Cleanup NEW/Backports NEW" + dak clean-suites -a new,backports-new } function sync_debbugs () { # sync with debbugs + log "Sync debbugs version tracking information" echo "--" >> $report timestamp=$(date "+%Y-%m-%d-%H:%M") mkdir -p $queuedir/bts_version_track_archive/${timestamp} rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp} rmdir --ignore-fail-on-non-empty $queuedir/bts_version_track_archive/${timestamp} # remove if empty. - rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true + rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/srv/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true NOW=$(date +%s) TSTAMP=$(stat -c %Y $lockdir/synced_bts_version) DIFF=$(( NOW - TSTAMP )) - if [ $DIFF -ge 259200 ]; then - log "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)" + if [[ $DIFF -ge 259200 ]]; then + log_error "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)" fi } function clean_debbugs () { + log "Cleanup debbugs" # Delete files older than 60 days find $queuedir/bts_version_track_archive/ -mtime +60 -type f -delete # Delete empty directories @@ -99,12 +219,15 @@ function clean_debbugs () { function reports() { # Send a report on NEW/BYHAND packages log "Nagging ftpteam about NEW/BYHAND packages" - dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" -a "From: Debian FTP Masters " ftpmaster@ftp-master.debian.org + dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" -a "From: Debian FTP Masters " backports-team@debian.org # and one on crufty packages log "Sending information about crufty packages" - dak cruft-report > $webdir/cruft-report-daily.txt - dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt - cat $webdir/cruft-report-daily.txt | mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + dak cruft-report -R > $webdir/cruft-report-daily.txt.new + dak cruft-report -R -s experimental >> $webdir/cruft-report-daily.txt.new + echo "Page generated on $(date -u)" >> $webdir/cruft-report-daily.txt.new + mv $webdir/cruft-report-daily.txt.new $webdir/cruft-report-daily.txt + mail -a "X-Debian: DAK" -e -s "Debian archive cruft report for $(date +%D)" -a "From: Debian FTP Masters " ftpmaster@ftp-master.debian.org < $webdir/cruft-report-daily.txt } function pg_timestamp() { @@ -112,3 +235,146 @@ function pg_timestamp() { log "Saving postgres transaction id for ${tsname}" psql -tAc 'select txid_current();' > $base/backup/txid_${tsname}_$(date +%Y.%m.%d-%H:%M:%S) } + +function get_archiveroot() { + local archivename="$1" + local query="SELECT path FROM archive WHERE name='${archivename}'" + local archiveroot="$(psql -tAc "${query}")" + if [[ -z ${archiveroot} ]]; then + echo "get_archiveroot: couldn't get archiveroot for '${archivename}'" >&2 + return 1 + fi + echo "${archiveroot}" +} + +# Prepare the trees for buildds, then push wanna-build +function do_buildd() { + if lockfile -r3 ${LOCK_DAILY}; then + TMPFILES="${TMPFILES} ${LOCK_DAILY}" + make_buildd_dir + wbtrigger + fi +} + +# Cleanup policy queues +function cleanpolicy() { + dak clean-suites -a backports-policy,policy +} + +# Scan new packages for contents +function scancontents() { + dak contents -l 10000 scan-binary + dak contents -l 1000 scan-source +} + +function ddaccess() { + # Tell our dd accessible mirror to sync itself up. + log "Trigger dd accessible parts sync" + ${scriptsdir}/sync-dd dd-sync dd-sync1 dd-sync2 sync +} + + + +######################################################################## +######################################################################## +######################################################################## +######################################################################## + +# Function to save which stage we are in, so we can restart an interrupted +# dinstall. Or even run actions in parallel, if we dare to, by simply +# backgrounding the call to this function. But that should only really be +# done for things we don't care much about. +# +# This should be called with the first argument being an array, with the +# members +# - FUNC - the function name to call +# - ARGS - Possible arguments to hand to the function. Can be the empty string +# - TIME - The timestamp name. Can be the empty string +# - ERR - if this is the string false, then the call will be surrounded by +# set +e ... set -e calls, so errors in the function do not exit +# dinstall. Can be the empty string, meaning true. +# +# MAKE SURE TO KEEP THIS THE LAST FUNCTION, AFTER ALL THE VARIOUS ONES +# ADDED FOR DINSTALL FEATURES! +function stage() { + ARGS='GO[@]' + local "${!ARGS}" + + local error=${ERR:-"true"} + + ARGS=${ARGS:-""} + + log "########## ${PROGRAM} BEGIN: ${FUNC} ${ARGS} ##########" + local STAGEFILE="${stagedir}/${FUNC}${ARGS:+_}${ARGS}" + STAGEFILE=${STAGEFILE// /_} + if [[ -f ${STAGEFILE} ]]; then + local stamptime=$(/usr/bin/stat -c %Z "${STAGEFILE}") + local unixtime=$(date +%s) + local difference=$(( unixtime - stamptime )) + if [[ ${difference} -ge 14400 ]]; then + log_error "Did already run ${FUNC}, stagefile exists, but that was ${difference} seconds ago. Please check." + else + log "Did already run ${FUNC}, not calling again..." + fi + return + fi + + debug "Now calling function ${FUNC}. Arguments: ${ARGS}. Timestamp: ${TIME}" + + # Make sure we are always at the same place. If a function wants + # to be elsewhere, it has to cd first! + cd ${configdir} + + # Now redirect the output into $STAGEFILE.log. In case it errors + # out somewhere our errorhandler trap can then mail the contents + # of $STAGEFILE.log only, instead of a whole ${PROGRAM} logfile. + # Short error mails ftw! + exec >> "${STAGEFILE}.log" 2>&1 + + if [[ -f ${LOCK_STOP} ]]; then + log "${LOCK_STOP} exists, exiting immediately" + exit 42 + fi + + # Do we care about trouble in the function we call? + if [[ ${error} == false ]]; then + set +e + fi + ${FUNC} ${ARGS} + + # No matter what happened in the function, we make sure we have + # set -e default state back + set -e + + # Make sure we are always at the same place. + cd ${configdir} + + # We always use the same umask. If a function wants to do + # different, fine, but we reset. + umask 022 + + touch "${STAGEFILE}" + + if [[ -n ${TIME} ]]; then + ts "${TIME}" + fi + + # And the output goes back to the normal logfile + exec >> "${LOGFILE}" 2>&1 + + # Now we should make sure that we have a usable ${PROGRAM}.log, so + # append the $STAGEFILE.log to it. + if [[ ${TIMESTAMP} == true ]]; then + /usr/bin/ts "%b %d %H:%M:%S ${HOSTNAME} ${PROGRAM}[$$]: ${FUNC} " < "${STAGEFILE}.log" + else + cat "${STAGEFILE}.log" + fi + rm -f "${STAGEFILE}.log" + + log "########## ${PROGRAM} END: ${FUNC} ##########" + + if [[ -f ${LOCK_STOP} ]]; then + log "${LOCK_STOP} exists, exiting immediately" + exit 42 + fi +}