Package: apt Version: 0.8.6 Severity: wishlist Tags: patch Hi,
Currently a 'random_sleep' function is implemented in /etc/cron.daily/apt to avoid a DoS on the mirrors. However, on desktop and workstation systems the script is not executed at 6:xx in the morning but later at random times after boot by anacron. The reason is simple, these systems are not up all the time. Please apply this patch to avoid 'random_sleep' if the script was started by anacron. --- apt_0.8x 2010-09-17 23:17:26.000000000 +0300 +++ /etc/cron.daily/apt 2010-10-15 11:24:38.287104775 +0300 @@ -415,7 +415,7 @@ # sleep random amount of time to avoid hitting the # mirrors at the same time -random_sleep +pidof -n anacron >/dev/null || random_sleep # update package lists UPDATED=0 Thanks -- Package-specific info: -- (no /etc/apt/preferences present) -- -- (/etc/apt/sources.list present, but not submitted) -- -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing'), (200, 'unstable'), (100, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages apt depends on: ii debian-archive-keyring 2010.08.28 GnuPG archive keys of the Debian a ii gnupg 1.4.10-4 GNU privacy guard - a free PGP rep ii libc6 2.11.2-6 Embedded GNU C Library: Shared lib ii libgcc1 1:4.4.5-2 GCC support library ii libstdc++6 4.4.5-2 The GNU Standard C++ Library v3 ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime apt recommends no packages. Versions of packages apt suggests: pn apt-doc <none> (no description available) ii aptitude 0.6.3-3.1 terminal-based package manager (te ii bzip2 1.0.5-6 high-quality block-sorting file co ii dpkg-dev 1.15.8.5 Debian package development tools ii lzma 4.43-14 Compression method of 7z format in ii python-apt 0.7.98.1 Python interface to libapt-pkg ii synaptic 0.70~pre1+b1 Graphical package manager -- Configuration Files: /etc/cron.daily/apt changed: check_stamp() { stamp="$1" interval="$2" if [ $interval -eq 0 ]; then debug_echo "check_stamp: interval=0" # treat as no time has passed return 1 fi if [ ! -f $stamp ]; then debug_echo "check_stamp: missing time stamp file: $stamp." # treat as enough time has passed return 0 fi # compare midnight today to midnight the day the stamp was updated stamp_file="$stamp" stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) if [ "$?" != "0" ]; then # Due to some timezones returning 'invalid date' for midnight on # certain dates (eg America/Sao_Paulo), if date returns with error # remove the stamp file and return 0. See coreutils bug: # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html rm -f "$stamp_file" return 0 fi now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) if [ "$?" != "0" ]; then # As above, due to some timezones returning 'invalid date' for midnight # on certain dates (eg America/Sao_Paulo), if date returns with error # return 0. return 0 fi delta=$(($now-$stamp)) # intervall is in days, convert to sec. interval=$(($interval*60*60*24)) debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)" # remove timestamps a day (or more) in the future and force re-check if [ $stamp -gt $(($now+86400)) ]; then echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" rm -f "$stamp_file" return 0 fi if [ $delta -ge $interval ]; then return 0 fi return 1 } update_stamp() { stamp="$1" touch $stamp } check_size_constraints() { MaxAge=0 eval $(apt-config shell MaxAge APT::Archives::MaxAge) eval $(apt-config shell MaxAge APT::Periodic::MaxAge) MinAge=2 eval $(apt-config shell MinAge APT::Archives::MinAge) eval $(apt-config shell MinAge APT::Periodic::MinAge) MaxSize=0 eval $(apt-config shell MaxSize APT::Archives::MaxSize) eval $(apt-config shell MaxSize APT::Periodic::MaxSize) Cache="/var/cache/apt/archives/" eval $(apt-config shell Cache Dir::Cache::archives/d) # sanity check if [ -z "$Cache" ]; then echo "empty Dir::Cache::archives, exiting" exit fi # check age if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f elif [ ! $MaxAge -eq 0 ]; then debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f else debug_echo "skip aging since MaxAge is 0" fi # check size if [ ! $MaxSize -eq 0 ]; then # maxSize is in MB MaxSize=$(($MaxSize*1024)) #get current time now=$(date --date=$(date --iso-8601) +%s) MinAge=$(($MinAge*24*60*60)) # reverse-sort by mtime for file in $(ls -rt $Cache/*.deb 2>/dev/null); do du=$(du -s $Cache) size=${du%%/*} # check if the cache is small enough if [ $size -lt $MaxSize ]; then debug_echo "end remove by archive size: size=$size < $MaxSize" break fi # check for MinAge of the file if [ $MinAge -ne 0 ]; then # check both ctime and mtime mtime=$(stat -c %Y $file) ctime=$(stat -c %Z $file) if [ $mtime -gt $ctime ]; then delta=$(($now-$mtime)) else delta=$(($now-$ctime)) fi if [ $delta -le $MinAge ]; then debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec" break else # delete oldest file debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize" rm -f $file fi fi done fi } do_cache_backup() { BackupArchiveInterval="$1" if [ $BackupArchiveInterval -eq 0 ]; then return fi # Set default values and normalize CacheDir="/var/cache/apt" eval $(apt-config shell CacheDir Dir::Cache/d) CacheDir=${CacheDir%/} if [ -z "$CacheDir" ]; then debug_echo "practically empty Dir::Cache, exiting" return 0 fi Cache="${CacheDir}/archives/" eval $(apt-config shell Cache Dir::Cache::Archives/d) if [ -z "$Cache" ]; then debug_echo "practically empty Dir::Cache::archives, exiting" return 0 fi BackupLevel=3 eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) if [ $BackupLevel -le 1 ]; then BackupLevel=2 ; fi Back="${CacheDir}/backup/" eval $(apt-config shell Back Dir::Cache::Backup/d) if [ -z "$Back" ]; then echo "practically empty Dir::Cache::Backup, exiting" 1>&2 return fi CacheArchive="$(basename "${Cache}")" test -n "${CacheArchive}" || CacheArchive="archives" BackX="${Back}${CacheArchive}/" for x in $(seq 0 1 $((${BackupLevel}-1))); do eval "Back${x}=${Back}${x}/" done # backup after n-days if archive contents changed. # (This uses hardlink to save disk space) BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then mkdir -p $Back rm -rf $Back$((${BackupLevel}-1)) for y in $(seq $((${BackupLevel}-1)) -1 1); do eval BackY=${Back}$y eval BackZ=${Back}$(($y-1)) if [ -e $BackZ ]; then mv -f $BackZ $BackY ; fi done cp -la $Cache $Back ; mv -f $BackX $Back0 update_stamp $BACKUP_ARCHIVE_STAMP debug_echo "backup with hardlinks. (success)" else debug_echo "skip backup since same content." fi else debug_echo "skip backup since too new." fi } random_sleep() { RandomSleep=1800 eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) if [ $RandomSleep -eq 0 ]; then return fi if [ -z "$RANDOM" ] ; then # A fix for shells that do not have this bash feature. RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") fi TIME=$(($RANDOM % $RandomSleep)) debug_echo "sleeping for $TIME seconds" sleep $TIME } debug_echo() { # Display message if $VERBOSE >= 1 if [ "$VERBOSE" -ge 1 ]; then echo $1 1>&2 fi } if cd /var/backups ; then if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then cp -p /var/lib/apt/extended_states apt.extended_states savelog -c 7 apt.extended_states >/dev/null fi fi if ! which apt-config >/dev/null ; then exit 0 fi AutoAptEnable=1 # default is yes eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) if [ $AutoAptEnable -eq 0 ]; then exit 0 fi VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) debug_echo "verbose level $VERBOSE" if [ "$VERBOSE" -le 2 ]; then # quiet for 0,1,2 XSTDOUT=">/dev/null" XSTDERR="2>/dev/null" XAPTOPT="-qq" XUUPOPT="" else XSTDOUT="" XSTDERR="" XAPTOPT="" XUUPOPT="-d" fi if [ "$VERBOSE" -ge 3 ]; then # trace output set -x fi if which on_ac_power >/dev/null; then on_ac_power POWER=$? if [ $POWER -eq 1 ]; then debug_echo "exit: system NOT on main power" exit 0 elif [ $POWER -ne 0 ]; then debug_echo "power status ($POWER) undetermined, continuing" fi debug_echo "system is on main power." fi if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then debug_echo "error encountered in cron job with \"apt-get check\"." exit 0 fi now=$(date +%s) UpdateInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) DownloadUpgradeableInterval=0 eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) UnattendedUpgradeInterval=0 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) AutocleanInterval=0 eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) BackupArchiveInterval=0 eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) Debdelta=1 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && [ $UnattendedUpgradeInterval -eq 0 ] && [ $BackupArchiveInterval -eq 0 ] && [ $AutocleanInterval -eq 0 ]; then # check cache size check_size_constraints exit 0 fi do_cache_backup $BackupArchiveInterval pidof -n anacron || random_sleep UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then if eval apt-get $XAPTOPT -y update $XSTDERR; then debug_echo "download updated metadata (success)." if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then if dbus-send --system / app.apt.dbus.updated boolean:true ; then debug_echo "send dbus signal (success)" else debug_echo "send dbus signal (error)" fi else debug_echo "dbus signal not send (command not available)" fi update_stamp $UPDATE_STAMP UPDATED=1 else debug_echo "download updated metadata (error)" fi else debug_echo "download updated metadata (not run)." fi DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then if [ $Debdelta -eq 1 ]; then debdelta-upgrade >/dev/null 2>&1 || true fi if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP debug_echo "download upgradable (success)" else debug_echo "download upgradable (error)" fi else debug_echo "download upgradable (not run)" fi UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp if [ $UPDATED -eq 1 ] && which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then if unattended-upgrade $XUUPOPT; then update_stamp $UPGRADE_STAMP debug_echo "unattended-upgrade (success)" else debug_echo "unattended-upgrade (error)" fi else debug_echo "unattended-upgrade (not run)" fi AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then debug_echo "autoclean (success)." update_stamp $AUTOCLEAN_STAMP else debug_echo "autoclean (error)" fi else debug_echo "autoclean (not run)" fi check_size_constraints -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org