From dd81a2afa63371cd7d9b418727c36ab76130bd82 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Tue, 22 Mar 2011 15:31:15 +0100 Subject: [PATCH] ries sync no longer push or name anything merkel sync ries differently depending on if its called with sync or pool that way cron.hourly does a small sync while cron.dinstall a full one triggers Signed-off-by: Joerg Jaspert --- config/debian/cron.dinstall | 14 +++-------- config/debian/dinstall.functions | 36 +++++----------------------- config/homedir/syncdd.sh | 41 ++++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 40451c81..27200dd1 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -172,7 +172,7 @@ GO=( stage $GO GO=( - FUNC="merkel1" + FUNC="qa1" TIME="init" ARGS="" ERR="false" @@ -436,14 +436,6 @@ GO=( ) stage $GO & -GO=( - FUNC="merkel2" - TIME="merkel projectb push" - ARGS="" - ERR="false" -) -stage $GO & - GO=( FUNC="mirrorpush" TIME="mirrorpush" @@ -479,8 +471,8 @@ stage $GO & rm -f "${LOCK_BRITNEY}" GO=( - FUNC="merkel3" - TIME="merkel ddaccessible sync" + FUNC="ddaccess" + TIME="ddaccessible sync" ARGS="" ERR="false" ) diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index abece803..e4de479e 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -38,27 +38,11 @@ function onerror() { ######################################################################## # pushing merkels QA user, part one -function merkel1() { - log "Telling merkels QA user that we start dinstall" +function qa1() { + log "Telling QA user that we start dinstall" ssh -2 -i ~dak/.ssh/push_merkel_qa -o BatchMode=yes -o SetupTimeOut=90 -o ConnectTimeout=90 qa@qa.debian.org sleep 1 } -# Create the postgres dump files -function pgdump_pre() { - log "Creating pre-daily-cron-job backup of $PGDATABASE database..." - pg_dump > $base/backup/dump_pre_$(date +%Y.%m.%d-%H:%M:%S) -} - -function pgdump_post() { - log "Creating post-daily-cron-job backup of $PGDATABASE database..." - cd $base/backup - POSTDUMP=$(date +%Y.%m.%d-%H:%M:%S) - pg_dump > $base/backup/dump_$POSTDUMP - #pg_dumpall --globals-only > $base/backup/dumpall_$POSTDUMP - ln -sf $base/backup/dump_$POSTDUMP current - #ln -sf $base/backup/dumpall_$POSTDUMP currentall -} - # Updating various files function updates() { log "Updating Bugs docu, Mirror list and mailing-lists.txt" @@ -444,18 +428,10 @@ function bts() { dak bts-categorize } -function merkel2() { - # Push dak@merkel so it syncs the projectb there. Returns immediately, the sync runs detached - log "Trigger merkel/flotows $PGDATABASE sync" - ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_projectb dak@merkel.debian.org sleep 1 - # Also trigger flotow, the ftpmaster test box - ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_flotow_projectb dak@flotow.debconf.org sleep 1 -} - -function merkel3() { - # Push dak@merkel to tell it to sync the dd accessible parts. Returns immediately, the sync runs detached - log "Trigger merkels dd accessible parts sync" - ssh -2 -o BatchMode=yes -o SetupTimeOut=30 -o ConnectTimeout=30 -i ~/.ssh/push_merkel_ddaccess dak@merkel.debian.org sleep 1 +function ddaccess() { + # Tell our dd accessible mirror to sync itself up. Including ftp dir. + log "Trigger dd accessible parts sync including ftp dir" + ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org pool } function mirrorpush() { diff --git a/config/homedir/syncdd.sh b/config/homedir/syncdd.sh index 794f48b5..652c29a0 100755 --- a/config/homedir/syncdd.sh +++ b/config/homedir/syncdd.sh @@ -26,6 +26,43 @@ export LC_ALL=C export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars . $SCRIPTVARS +EXTRA="" + +check_commandline() { + while [ $# -gt 0 ]; do + case "$1" in + sync) + EXTRA="--exclude ftp/" + ;; + pool) + ;; + *) + echo "Unknown option ${1} ignored" + ;; + esac + shift # Check next set of parameters. + done +} + +if [ $# -gt 0 ]; then + ORIGINAL_COMMAND=$* +else + ORIGINAL_COMMAND="" +fi + +SSH_ORIGINAL_COMMAND=${SSH_ORIGINAL_COMMAND:-""} +if [ -n "${SSH_ORIGINAL_COMMAND}" ]; then + set "nothing" "${SSH_ORIGINAL_COMMAND}" + shift + check_commandline $* +fi + +if [ -n "${ORIGINAL_COMMAND}" ]; then + set ${ORIGINAL_COMMAND} + check_commandline $* +fi + + cleanup() { rm -f "${HOME}/sync.lock" } @@ -40,8 +77,8 @@ if lockfile -r3 ${HOME}/sync.lock; then rsync -aH -B8192 \ --exclude backup/*.xz \ --exclude backup/dump* \ - --exclude ftp/ \ - --exclude mirror/ \ + ${EXTRA} \ + --exclude mirror \ --exclude morgue/ \ --exclude=lost+found/ \ --exclude .da-backup.trace \ -- 2.39.5