openstack/diskimage-builder
Code Issues Proposed changes

Makes image caching more resilient

Browse Source 
Avoids failing on the first attempt to download the image to cache as
mirrors hosting them can randomly go down, usually with a connection
refused.

Change-Id: I9de9f33c2cc16596d04b35c4eb92621e6a2c7511
This commit is contained in:
Sorin Sbarnea 2019-04-30 10:12:51 +01:00 committed by Ian Wienand
parent 5f9024affa
commit fb656718fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/elements/cache-url/bin/cache-url
View File

@ -61,7 +61,7 @@ done
url=$1 url=$1
dest=$2 dest=$2
time_cond= time_cond=
curl_opts="" curl_opts="--retry 3 --retry-delay 30 "
if [ -z $url -o -z $dest ] ; then if [ -z $url -o -z $dest ] ; then
show_options 1 show_options 1
@ -77,7 +77,7 @@ else
fi fi
if [ "$FORCE_REVALIDATE" = "1" ]; then if [ "$FORCE_REVALIDATE" = "1" ]; then
curl_opts="-H 'Pragma: no-cache, must-revalidate' -H 'Cache-Control: no-cache, must-revalidate'" curl_opts+="-H 'Pragma: no-cache, must-revalidate' -H 'Cache-Control: no-cache, must-revalidate'"
success="Downloaded and cached $url, having forced upstream caches to revalidate" success="Downloaded and cached $url, having forced upstream caches to revalidate"
elif [ -f $dest -a -s $dest ] ; then elif [ -f $dest -a -s $dest ] ; then
time_cond="-z $dest" time_cond="-z $dest"