-
Notifications
You must be signed in to change notification settings - Fork 23
Retry presto-deps dependency downloads on transient network failures #359
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Avinash-Raj
wants to merge
1
commit into
main
Choose a base branch
from
retry-presto-deps-network-downloads
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,12 +117,28 @@ jobs: | |
| cp -r velox/scripts presto-deps-context/velox/scripts | ||
| cp -r velox/CMake presto-deps-context/velox/CMake | ||
|
|
||
| # Harden the dependency-install layer against transient network blips. | ||
| # The upstream Presto/Velox setup scripts run many unguarded downloads | ||
| # (curl tarballs, dnf repos, wget mirrors); rather than fork those | ||
| # scripts we inject retry/timeout config into the staged Dockerfile: | ||
| # - CURL_OPTIONS is honoured by velox's wget_and_untar (curl -L ...) | ||
| # - dnf.conf retries/timeout/minrate cover dnf installs (incl. CUDA repo) | ||
| # - /etc/wgetrc covers the remaining direct `wget` downloads (e.g. minio) | ||
| dockerfile=presto-deps-context/scripts/dockerfiles/centos-dependency.dockerfile | ||
| sed -i \ | ||
| -e '/^ENV UCX_VERSION/a ENV CURL_OPTIONS="--retry 5 --retry-delay 5 --retry-all-errors --retry-connrefused --connect-timeout 30"' \ | ||
| -e '/^ENV UCX_VERSION/a RUN { echo retries=10; echo timeout=60; echo minrate=500; } >> /etc/dnf/dnf.conf && { echo tries=5; echo timeout=30; echo waitretry=5; echo retry_connrefused=on; echo read_timeout=300; } >> /etc/wgetrc' \ | ||
| "$dockerfile" | ||
| grep -q '^ENV CURL_OPTIONS=' "$dockerfile" || { echo "::error::failed to inject network-retry config (anchor 'ENV UCX_VERSION' not found in upstream dockerfile)"; exit 1; } | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Else it won't build the deps image. |
||
| echo "---- patched dependency install section ----" | ||
| sed -n '/^ENV UCX_VERSION/,/rm -rf build/p' "$dockerfile" | ||
|
|
||
| - name: Build and push Presto deps image | ||
| id: push | ||
| uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 | ||
| with: | ||
| context: presto-deps-context | ||
| file: presto/presto-native-execution/scripts/dockerfiles/centos-dependency.dockerfile | ||
| file: presto-deps-context/scripts/dockerfiles/centos-dependency.dockerfile | ||
| build-args: | | ||
| CUDA_VERSION=${{ matrix.cuda_version }} | ||
| ARM_BUILD_TARGET=generic | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this append happens after
ENV UCX_VERSIONline and we believe that the line should always be exists on the presto's centos deps dockerfile.