Improve remote fetch (#12795)
### Why I did it To fix those errors: One: ``` Connecting to urm.nvidia.com (urm.nvidia.com)|*.*.*.*|:443... connected. GnuTLS: Error in the pull function. Unable to establish SSL connection. Error 4 make[1]: Leaving directory '/sonic/src/smartmontools' [ target/debs/bullseye/smartmontools_6.6-1_amd64.deb ] ``` Second: ``` Get:90 https://debian-mirror-url buster/main amd64 librrd-dev amd64 1.7.1-2 [284 kB] Get:91 https://debian-mirror-url buster/main amd64 psmisc amd64 23.2-1+deb10u1 [126 kB] Get:92 https://debian-mirror-url buster/main amd64 python-smbus amd64 4.1-1 [12.2 kB] Get:93 https://debian-mirror-url buster/main amd64 python3.7-dev amd64 3.7.3-2+deb10u3 [510 kB] Get:94 https://debian-mirror-url buster/main amd64 python3-dev amd64 3.7.3-1 [1264 B] Get:95 https://debian-mirror-url buster/main amd64 python3-smbus amd64 4.1-1 [12.5 kB] Get:96 https://debian-mirror-url buster/main amd64 rrdtool amd64 1.7.1-2 [485 kB] Fetched 122 MB in 12s (9976 kB/s) [91mE: Failed to fetch https://debian-mirror-url/pool/main/p/python-defaults/python2-minimal_2.7.16-1_amd64.deb 500 Internal Server Error [IP: *.*.*.* 443] E: Failed to fetch https://debian-mirror-url/pool/main/f/fontconfig/fontconfig-config_2.13.1-2_all.deb 500 Internal Server Error [IP: *.*.*.* 443] E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? [0mThe command '/bin/sh -c apt-get update && apt-get install -y build-essential python3-dev ipmitool librrd8 librrd-dev rrdtool python-smbus python3-smbus dmidecode i2c-tools psmisc libpci3' returned a non-zero code: 100 [ target/docker-platform-monitor.gz ] Error 1 ``` #### How I did it Add retry mechanism to apt, wget, and curl hooks
This commit is contained in:
parent
5aea3a976c
commit
52f6dd65a3
3
.gitignore
vendored
3
.gitignore
vendored
@ -105,3 +105,6 @@ htmlcov/
|
|||||||
# Debian mirror Sources
|
# Debian mirror Sources
|
||||||
sources.list.*
|
sources.list.*
|
||||||
!sources.list*.j2
|
!sources.list*.j2
|
||||||
|
|
||||||
|
# Generated mirror configs
|
||||||
|
apt-retries-count
|
||||||
|
@ -113,7 +113,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
|
|||||||
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
|
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
|
||||||
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
|
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
|
||||||
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
|
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
|
||||||
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until,apt-multiple-retries} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
|
sudo cp files/apt/apt-retries-count $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
|
||||||
|
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
|
||||||
|
|
||||||
## Note: set lang to prevent locale warnings in your chroot
|
## Note: set lang to prevent locale warnings in your chroot
|
||||||
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
|
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
|
||||||
|
@ -30,6 +30,7 @@ COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
|
|||||||
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
||||||
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
|
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
|
||||||
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
|
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
|
||||||
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
|
|
||||||
# Update apt cache and
|
# Update apt cache and
|
||||||
# pre-install fundamental packages
|
# pre-install fundamental packages
|
||||||
|
@ -30,6 +30,7 @@ COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
|
|||||||
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
||||||
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
|
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
|
||||||
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
|
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
|
||||||
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
|
|
||||||
# Update apt cache and
|
# Update apt cache and
|
||||||
# pre-install fundamental packages
|
# pre-install fundamental packages
|
||||||
|
@ -38,6 +38,7 @@ COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
|
|||||||
COPY ["sources.list", "/etc/apt/sources.list"]
|
COPY ["sources.list", "/etc/apt/sources.list"]
|
||||||
{% endif %}
|
{% endif %}
|
||||||
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
|
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
|
||||||
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
|
|
||||||
# Pre-install fundamental packages
|
# Pre-install fundamental packages
|
||||||
|
2
files/apt/apt-retries-count.j2
Normal file
2
files/apt/apt-retries-count.j2
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
# Instruct apt to retry downloads on failures
|
||||||
|
Acquire::Retries "{{ APT_RETRIES_COUNT }}";
|
@ -5,6 +5,10 @@ CONFIG_PATH=$1
|
|||||||
export ARCHITECTURE=$2
|
export ARCHITECTURE=$2
|
||||||
export DISTRIBUTION=$3
|
export DISTRIBUTION=$3
|
||||||
|
|
||||||
|
# Handling default
|
||||||
|
[[ -z $APT_RETRIES_COUNT ]] && APT_RETRIES_COUNT=20
|
||||||
|
export APT_RETRIES_COUNT
|
||||||
|
|
||||||
DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net
|
DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net
|
||||||
MIRROR_VERSION_FILE=
|
MIRROR_VERSION_FILE=
|
||||||
[[ "$SONIC_VERSION_CONTROL_COMPONENTS" == *deb* || $SONIC_VERSION_CONTROL_COMPONENTS == *all* ]] && MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror
|
[[ "$SONIC_VERSION_CONTROL_COMPONENTS" == *deb* || $SONIC_VERSION_CONTROL_COMPONENTS == *all* ]] && MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror
|
||||||
@ -40,6 +44,7 @@ if [ "$MIRROR_SNAPSHOT" == y ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Handle sources list
|
||||||
[ -z "$MIRROR_URLS" ] && MIRROR_URLS=$DEFAULT_MIRROR_URLS
|
[ -z "$MIRROR_URLS" ] && MIRROR_URLS=$DEFAULT_MIRROR_URLS
|
||||||
[ -z "$MIRROR_SECURITY_URLS" ] && MIRROR_SECURITY_URLS=$DEFAULT_MIRROR_SECURITY_URLS
|
[ -z "$MIRROR_SECURITY_URLS" ] && MIRROR_SECURITY_URLS=$DEFAULT_MIRROR_SECURITY_URLS
|
||||||
|
|
||||||
@ -53,3 +58,8 @@ if [ "$MIRROR_SNAPSHOT" == y ]; then
|
|||||||
# Set the snapshot mirror, and add the SET_REPR_MIRRORS flag
|
# Set the snapshot mirror, and add the SET_REPR_MIRRORS flag
|
||||||
sed -i -e "/^#*deb.*packages.trafficmanager.net/! s/^#*deb/#&/" -e "\$a#SET_REPR_MIRRORS" $CONFIG_PATH/sources.list.$ARCHITECTURE
|
sed -i -e "/^#*deb.*packages.trafficmanager.net/! s/^#*deb/#&/" -e "\$a#SET_REPR_MIRRORS" $CONFIG_PATH/sources.list.$ARCHITECTURE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Handle apt retry count config
|
||||||
|
APT_RETRIES_COUNT_FILENAME=apt-retries-count
|
||||||
|
TEMPLATE=files/apt/$APT_RETRIES_COUNT_FILENAME.j2
|
||||||
|
j2 $TEMPLATE > $CONFIG_PATH/$APT_RETRIES_COUNT_FILENAME
|
||||||
|
@ -22,7 +22,7 @@ FROM {{ prefix }}debian:bullseye
|
|||||||
MAINTAINER gulv@microsoft.com
|
MAINTAINER gulv@microsoft.com
|
||||||
|
|
||||||
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
||||||
COPY ["apt-multiple-retries", "/etc/apt/apt.conf.d/"]
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
|
|
||||||
{%- if CROSS_BUILD_ENVIRON != "y" %}
|
{%- if CROSS_BUILD_ENVIRON != "y" %}
|
||||||
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
# Instruct apt to retry downloads on failures
|
|
||||||
# This is required only for bullseye.
|
|
||||||
|
|
||||||
Acquire::Retries "3";
|
|
@ -21,6 +21,7 @@ FROM {{ prefix }}debian:buster
|
|||||||
MAINTAINER gulv@microsoft.com
|
MAINTAINER gulv@microsoft.com
|
||||||
|
|
||||||
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
||||||
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
|
|
||||||
{%- if CROSS_BUILD_ENVIRON != "y" %}
|
{%- if CROSS_BUILD_ENVIRON != "y" %}
|
||||||
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
||||||
|
@ -10,6 +10,7 @@ FROM {{ prefix }}debian:jessie
|
|||||||
MAINTAINER johnar@microsoft.com
|
MAINTAINER johnar@microsoft.com
|
||||||
|
|
||||||
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
||||||
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
|
|
||||||
## Remove retired jessie-updates repo
|
## Remove retired jessie-updates repo
|
||||||
RUN sed -i '/http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
|
RUN sed -i '/http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
|
||||||
|
@ -10,6 +10,7 @@ FROM {{ prefix }}debian:stretch
|
|||||||
MAINTAINER gulv@microsoft.com
|
MAINTAINER gulv@microsoft.com
|
||||||
|
|
||||||
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]
|
||||||
|
COPY ["apt-retries-count", "/etc/apt/apt.conf.d"]
|
||||||
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
|
||||||
|
|
||||||
## Make apt-get non-interactive
|
## Make apt-get non-interactive
|
||||||
|
@ -3,6 +3,19 @@
|
|||||||
. /usr/local/share/buildinfo/scripts/buildinfo_base.sh
|
. /usr/local/share/buildinfo/scripts/buildinfo_base.sh
|
||||||
[ -z $REAL_COMMAND ] && REAL_COMMAND=/usr/bin/curl
|
[ -z $REAL_COMMAND ] && REAL_COMMAND=/usr/bin/curl
|
||||||
|
|
||||||
|
# Retry if something super-weird has happened. Use --retry-connrefused and
|
||||||
|
# --retry options for curl.
|
||||||
|
# --retry-connrefused - Consider "connection refused" a transient error and try
|
||||||
|
# again. Normally wget/curl gives up on a URL when it is unable to connect to
|
||||||
|
# the site because failure to connect is taken as a sign that the server is not
|
||||||
|
# running at all and that retries would not help. This option is for mirroring
|
||||||
|
# unreliable sites whose servers tend to disappear for short periods of time.
|
||||||
|
# --retry - If a transient error is returned when curl tries to perform a
|
||||||
|
# transfer, it will retry this number of times before giving up. Transient error
|
||||||
|
# means either: a timeout, an FTP 4xx response code or an HTTP 408, 429, 500,
|
||||||
|
# 502, 503 or 504 response code.
|
||||||
|
REAL_COMMAND="$REAL_COMMAND --retry-connrefused --retry 5"
|
||||||
|
|
||||||
if [ "$SKIP_BUILD_HOOK" == y ]; then
|
if [ "$SKIP_BUILD_HOOK" == y ]; then
|
||||||
$REAL_COMMAND "$@"
|
$REAL_COMMAND "$@"
|
||||||
exit $?
|
exit $?
|
||||||
|
@ -7,6 +7,15 @@ if [ -z "$REAL_COMMAND" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Retry if something super-weird has happened. Use --retry-connrefused option
|
||||||
|
# for wget.
|
||||||
|
# --retry-connrefused - Consider "connection refused" a transient error and try
|
||||||
|
# again. Normally wget/curl gives up on a URL when it is unable to connect to
|
||||||
|
# the site because failure to connect is taken as a sign that the server is not
|
||||||
|
# running at all and that retries would not help. This option is for mirroring
|
||||||
|
# unreliable sites whose servers tend to disappear for short periods of time.
|
||||||
|
REAL_COMMAND="$REAL_COMMAND --retry-connrefused"
|
||||||
|
|
||||||
if [ "$SKIP_BUILD_HOOK" == y ]; then
|
if [ "$SKIP_BUILD_HOOK" == y ]; then
|
||||||
$REAL_COMMAND "$@"
|
$REAL_COMMAND "$@"
|
||||||
exit $?
|
exit $?
|
||||||
|
@ -13,6 +13,7 @@ WEB_VERSION_FILE=$VERSION_PATH/versions-web
|
|||||||
BUILD_WEB_VERSION_FILE=$BUILD_VERSION_PATH/versions-web
|
BUILD_WEB_VERSION_FILE=$BUILD_VERSION_PATH/versions-web
|
||||||
REPR_MIRROR_URL_PATTERN='http:\/\/packages.trafficmanager.net\/'
|
REPR_MIRROR_URL_PATTERN='http:\/\/packages.trafficmanager.net\/'
|
||||||
DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
|
DPKG_INSTALLTION_LOCK_FILE=/tmp/.dpkg_installation.lock
|
||||||
|
GET_RETRY_COUNT=5
|
||||||
|
|
||||||
. $BUILDINFO_PATH/config/buildinfo.config
|
. $BUILDINFO_PATH/config/buildinfo.config
|
||||||
|
|
||||||
@ -242,10 +243,17 @@ download_packages()
|
|||||||
return $result
|
return $result
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$REAL_COMMAND "${parameters[@]}"
|
# Retry if something super-weird has happened
|
||||||
result=$?
|
for ((i = 1; i <= GET_RETRY_COUNT; i++)); do
|
||||||
|
$REAL_COMMAND "${parameters[@]}"
|
||||||
|
result=$?
|
||||||
|
if [ $result -eq 0 ]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
log_err "Try $i: $REAL_COMMAND failed to get: ${parameters[@]}. Retry.."
|
||||||
|
done
|
||||||
|
|
||||||
#Return if there is any error
|
# Return if there is any error
|
||||||
if [ ${result} -ne 0 ]; then
|
if [ ${result} -ne 0 ]; then
|
||||||
exit ${result}
|
exit ${result}
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user