diff options
| author | bors <bors@rust-lang.org> | 2019-02-23 11:32:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-23 11:32:10 +0000 |
| commit | bcfb5e8ac30c46ba512526d66f803756c124c7bb (patch) | |
| tree | 5058dbd317469b5242a4267c42a7150ab61685a3 | |
| parent | 082c86175fcf72c355e6a889956fbea59e65bcdb (diff) | |
| parent | ee07b15a3c6076f31cc8085ec9274663b20b5af3 (diff) | |
| download | rust-bcfb5e8ac30c46ba512526d66f803756c124c7bb.tar.gz rust-bcfb5e8ac30c46ba512526d66f803756c124c7bb.zip | |
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.
| -rwxr-xr-x | src/ci/docker/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 25d4d73c7fe..b4426bbfb96 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -31,7 +31,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then echo "Attempting to download $s3url" rm -f /tmp/rustci_docker_cache 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/') set -e echo "Downloaded containers:\n$loaded_images" |