-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
llb: deterministic marshaling for protobuf and store results from multiple constraints #5374
Merged
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
jsternberg
force-pushed
the
marshal-constraints-cache
branch
2 times, most recently
from
September 30, 2024 21:59
c600bda
to
5776658
Compare
jsternberg
force-pushed
the
marshal-constraints-cache
branch
from
October 2, 2024 14:52
5776658
to
b463112
Compare
…tiple constraints This fixes a problem with the new protobuf marshaling with the standard library. LLB digests are now forced into deterministic marshaling to ensure they produce the same digest when marshaled multiple times. In addition, the marshal cache has also been fixed to work in multi-threaded frontends with multiple different constraints. Previously, if an LLB vertex was used in multiple goroutines and marshaled concurrently, the cache would be broken. This could cause certain problems when a specific node was used multiple times in the same LLB tree. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
jsternberg
force-pushed
the
marshal-constraints-cache
branch
from
October 2, 2024 16:17
b463112
to
d59218e
Compare
github-actions
bot
added
area/dockerfile
area/project
area/frontend
and removed
area/dockerfile
area/project
area/frontend
labels
Oct 2, 2024
tonistiigi
approved these changes
Oct 2, 2024
@jsternberg I don't think you can revert back to |
Yea I'll revert it back. I mostly changed it so I could test the PR. |
jsternberg
force-pushed
the
marshal-constraints-cache
branch
from
October 2, 2024 19:53
46a4db1
to
d59218e
Compare
tonistiigi
approved these changes
Oct 2, 2024
@jsternberg New master image has been built. You can bring back the second commit now. |
@tonistiigi Maybe just revert my changes #5361 ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 fixes a problem with the new protobuf marshaling with the standard library. LLB digests are now forced into deterministic marshaling to ensure they produce the same digest when marshaled multiple times.
In addition, the marshal cache has also been fixed to work in multi-threaded frontends with multiple different constraints. Previously, if an LLB vertex was used in multiple goroutines and marshaled concurrently, the cache would be broken. This could cause certain problems when a specific node was used multiple times in the same LLB tree.