mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #58655 - kennytm:download-docker-cache-with-timeout, r=alexcrichton

Browse Source 
Added a connection timeout and speed threshold when downloading the Docker cache

This is an attempt to fix one possible cause of #56112. Similar to #52846, this changed the download docker-cache command to fail if it cannot connect or falls below 10 bytes/s after 30 seconds, so it could be retried sooner.
This commit is contained in:
bors 2019-02-23 11:32:10 +00:00
commit bcfb5e8ac3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/docker/run.sh
View File

@ -31,7 +31,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
echo "Attempting to download $s3url" echo "Attempting to download $s3url"
rm -f /tmp/rustci_docker_cache rm -f /tmp/rustci_docker_cache
set +e set +e
retry curl -f -L -C - -o /tmp/rustci_docker_cache "$url" retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache "$url"
loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/') loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/')
set -e set -e
echo "Downloaded containers:\n$loaded_images" echo "Downloaded containers:\n$loaded_images"