Re-Add file check to cacheing algorithm #1925
Closed
Conversation
This file contains 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
TomSweeneyRedHat
force-pushed
the
dev/tsweeney/cachetar3
branch
from
a14ea45 to
baf8007
Compare
|
@TomSweeneyRedHat Tests are not happy. |
|
Ugh, I swear I spend more time making the tests work in the CI than I do the actual code changes sometimes. This worked fine in my sandbox, but it looks like an environment variable resolution issue in the CI. I'll go hard code it, thanks for the heads up @rhatdan |
TomSweeneyRedHat
force-pushed
the
dev/tsweeney/cachetar3
branch
from
baf8007 to
2d7aa9d
Compare
|
I take the variable bit back, it looks like a git hiccup, it's not seeing my new bud/change-archive directory. Gotta dig. |
Add back the file checking mechanisms that were removed as part of the reworking of the cache in containers#1792. If we have a 'COPY mytar.tar.xz' command in the Containerfile and the tar file was regenerated after an intial build, secondary 'buildah bud' commands would use the cache from the first build for the tar file instead of regenerating it. The historyMatches() function (https://github.com/containers/buildah/blob/master/imagebuildah/executor.go#L287) does not seem to pick up this type of change and I wasn't able to quickly rework that to do so. We may want to revert back to this check for now, then tweak the historyMatches to work properly in a follow up PR. Regardless, I've added a test as part of this PR to catch this issue going forward. Fixes: containers#1906 Signed-off-by: TomSweeneyRedHat <[email protected]>
TomSweeneyRedHat
force-pushed
the
dev/tsweeney/cachetar3
branch
from
2d7aa9d to
600c658
Compare
|
OMG, second day in a row with a corrupted sandbox. Will have to spin up a new PR for this. |
TomSweeneyRedHat
added a commit
to TomSweeneyRedHat/buildah
that referenced
this pull request
Oct 16, 2019
Try 2 after I accidentally nuked my sandbox for containers#1925 Add back the file checking mechanisms that were removed as part of the reworking of the cache in containers#1792. If we have a 'COPY mytar.tar.xz' command in the Containerfile and the tar file was regenerated after an intial build, secondary 'buildah bud' commands would use the cache from the first build for the tar file instead of regenerating it. The historyMatches() function (https://github.com/containers/buildah/blob/master/imagebuildah/executor.go#L287) does not seem to pick up this type of change and I wasn't able to quickly rework that to do so. We may want to revert back to this check for now, then tweak the historyMatches to work properly in a follow up PR. Regardless, I've added a test as part of this PR to catch this issue going forward. FWIW, with the exception of the test code, all of the code is a reversion to pre-existing code. Fixes: containers#1906 Signed-off-by: TomSweeneyRedHat <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Add back the file checking mechanisms that were removed as part of the
reworking of the cache in #1792. If we have a 'COPY mytar.tar.xz' command
in the Containerfile and the tar file was regenerated after an intial build,
secondary 'buildah bud' commands would use the cache from the first build
for the tar file instead of regenerating it.
The historyMatches() function (https://github.com/containers/buildah/blob/master/imagebuildah/executor.go#L287)
does not seem to pick up this type of change and I wasn't able to quickly
rework that to do so. We may want to revert back to this check for now,
then tweak the historyMatches to work properly in a follow up PR.
Regardless, I've added a test as part of this PR to catch this issue
going forward.
FWIW, with the exception of the test code, all of the code is a reversion to pre-existing code.
Fixes: #1906
Signed-off-by: TomSweeneyRedHat [email protected]