buildcache: skip unrecognized metadata files#40941
Merged
haampie merged 5 commits intospack:developfrom Nov 9, 2023
Merged
Conversation
spackbot-app
bot
added
binary-packages
core
Contributor
Author
|
fyi @kwryankrattiger |
scottwittenburg
force-pushed
the
buildcache-version-check-backport
branch
from
ee6fad6 to
934b4b7
Compare
scottwittenburg
force-pushed
the
buildcache-version-check-backport
branch
from
934b4b7 to
5ea0da6
Compare
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
haampie
reviewed
Nov 9, 2023
haampie
reviewed
Nov 9, 2023
haampie
reviewed
Nov 9, 2023
haampie
reviewed
Nov 9, 2023
This comment was marked as resolved.
This comment was marked as resolved.
Member
|
@scottwittenburg given the lack of time I took over your PR instead of reviewing it. |
haampie
changed the title
alalazo
approved these changes
Nov 9, 2023
Member
alalazo
left a comment
alalazo
left a comment
There was a problem hiding this comment.
I didn't test this extensively, but from a first read it seems fine. I just left a few comments that, in case, can be addressed in a later PR.
|
|
||
| # Ensure this version is not too new. | ||
| try: | ||
| layout_version = int(spec_dict.get("buildcache_layout_version", 0)) |
Member
There was a problem hiding this comment.
(Not a request, just a comment) Do we have any formal specification (a schema?) of what a spec_dict looks like?
Member
There was a problem hiding this comment.
I believe there was, but pretty sure it's unused or outdated
Comment on lines
+1697
to
+1700
| _get_valid_spec_file( | ||
| local_specfile_stage.save_filename, | ||
| CURRENT_BUILD_CACHE_LAYOUT_VERSION, | ||
| ) |
Member
There was a problem hiding this comment.
(Just a comment) Wondering if we can turn this double nested try/except into a context manager
|
|
||
| def build_cache_relative_path(): | ||
| return _build_cache_relative_path | ||
| return BUILD_CACHE_RELATIVE_PATH |
Member
There was a problem hiding this comment.
(minor) This function and the one below are probably unnecessary
| else: | ||
| raise ValueError("{0} not a valid spec file type".format(spec_file)) | ||
| spec_dict["buildcache_layout_version"] = 1 | ||
| spec_dict["buildcache_layout_version"] = CURRENT_BUILD_CACHE_LAYOUT_VERSION |
Member
There was a problem hiding this comment.
(Minor) We should probably decide whether it's buildcache or build_cache
| shutil.rmtree(tmpdir) | ||
| raise e | ||
| else: | ||
| elif layout_version == 1: |
Member
There was a problem hiding this comment.
Do we need an else case here for unknown layouts?
haampie
added a commit
that referenced
this pull request
Nov 9, 2023
This commit improves forward compatibility of Spack with newer build cache metadata formats. Before this commit, invalid or unrecognized metadata would be fatal errors, now they just cause a mirror to be skipped. Co-authored-by: Harmen Stoppels <[email protected]>
haampie
added a commit
that referenced
this pull request
Nov 9, 2023
This commit improves forward compatibility of Spack with newer build cache metadata formats. Before this commit, invalid or unrecognized metadata would be fatal errors, now they just cause a mirror to be skipped. Co-authored-by: Harmen Stoppels <[email protected]>
tgamblin
pushed a commit
that referenced
this pull request
Nov 11, 2023
This commit improves forward compatibility of Spack with newer build cache metadata formats. Before this commit, invalid or unrecognized metadata would be fatal errors, now they just cause a mirror to be skipped. Co-authored-by: Harmen Stoppels <[email protected]>
gabrielctn
pushed a commit
to gabrielctn/spack
that referenced
this pull request
Nov 24, 2023
This commit improves forward compatibility of Spack with newer build cache metadata formats. Before this commit, invalid or unrecognized metadata would be fatal errors, now they just cause a mirror to be skipped. Co-authored-by: Harmen Stoppels <[email protected]>
This was referenced Nov 29, 2023
mtaillefumier
pushed a commit
to mtaillefumier/spack
that referenced
this pull request
Dec 14, 2023
This commit improves forward compatibility of Spack with newer build cache metadata formats. Before this commit, invalid or unrecognized metadata would be fatal errors, now they just cause a mirror to be skipped. Co-authored-by: Harmen Stoppels <[email protected]>
vjranagit
pushed a commit
to vjranagit/spack
that referenced
this pull request
Jan 18, 2026
This commit improves forward compatibility of Spack with newer build cache metadata formats. Before this commit, invalid or unrecognized metadata would be fatal errors, now they just cause a mirror to be skipped. Co-authored-by: Harmen Stoppels <[email protected]>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR ensures that unrecognized metadata files do not cause download failure, but are skipped.
This improves forward compatibility with future metadata formats.