Only stage required wheel packages from requirements cache, not entire cache directory #37360
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.
Fixes #35717
When using
--requirements_file, the Python SDK downloads wheel packages to a cache directory (TEMPDIR/dataflow-requirements-cache), the stager would stage all packages in the cache directory, even those not needed by the current workflow. This caused unnecessary files to be staged and uploaded.(cc @hjtran)
Changes
_populate_requirements_cacheto download packages to a temporary directory first, then copy to cache. This allows tracking exactly which packages are needed for the current requirements file.create_job_resourcesto only stage packages returned by_populate_requirements_cache, rather than globbing the entire cache directory.dataflow-requirements-cachetobeam-requirements-cache(runner-agnostic naming).test_only_required_packages_staged_from_cacheto verify the fix.Example
Before this fix:
numpy,pandas→ cache hasnumpy.whl,pandas.whlscipy→ cache now hasnumpy.whl,pandas.whl,scipy.whlscipyis neededAfter this fix:
Testing
stager_test.pytests passtest_only_required_packages_staged_from_cacheverifies only required packages are stagedThank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, commentfixes #<ISSUE NUMBER>instead.CHANGES.mdwith noteworthy changes.See the Contributor Guide for more tips on how to make review process smoother.
To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md
GitHub Actions Tests Status (on master branch)
See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.