X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=3d9e7ed0b9dfc92a1da3ca56d2b960eae96e7559;hb=85f1c5ad5221e240a97579b3398ded06ecc8e7d1;hp=8b34f48d2432988afbca5f9dc2b130d9f4a0c0ec;hpb=83978ebb51dcd06c7a4cc2bd7ebf0a42344fdbed;p=mirror%2Fdsa-puppet.git diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb index 8b34f48d2..3d9e7ed0b 100755 --- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb +++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb @@ -130,14 +130,14 @@ while read host port username cluster version; do # get a "randomish" but stable value for this backup run val=$(echo "$MYHOSTNAME-$host-$port-$mtime" | sha256sum | head -c 8) val=$((16#$val)) - valmod=$(($val % $DELTA_WAIT_SUCCESS)) - after_min=$((delta - MIN_WAIT_SUCCESS)) - if [ "$after_min" -lt "$valmod" ]; then + rnd_cuttoff=$(($val % $DELTA_WAIT_SUCCESS)) + age_after_min=$((delta - MIN_WAIT_SUCCESS)) + if [ "$age_after_min" -lt "$rnd_cuttoff" ]; then runme=0 - log "Skipping $host:$port $version/$cluster because random computer says wait ($after_min < $valmod)." + log "Skipping $host:$port $version/$cluster because random computer says wait ($age_after_min < $rnd_cuttoff)." else runme=1 - log "Planning to run $host:$port $version/$cluster because random computer says so ($after_min >= $valmod)." + log "Planning to run $host:$port $version/$cluster because random computer says so ($age_after_min >= $rnd_cuttoff)." fi fi fi