Skip to content

Commit bcfb5e8

Browse files
committed
Auto merge of #58655 - kennytm:download-docker-cache-with-timeout, r=alexcrichton
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.
2 parents 082c861 + ee07b15 commit bcfb5e8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/ci/docker/run.sh

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

0 commit comments

Comments
 (0)