Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix: Marshal Input Vertices in a consistent order #4706

Merged
merged 6 commits into from
Mar 5, 2024
Merged

Fix: Marshal Input Vertices in a consistent order #4706

merged 6 commits into from
Mar 5, 2024

Conversation

adamperlin
Copy link
Contributor

@adamperlin adamperlin commented Feb 27, 2024 •
edited
Loading

This is a possible fix for #4695. I am opening to run against CI, as I've had trouble running full tests locally

@adamperlin
Pre-convert outputs to inputs in llb client marshaller in order to tr…
106e8e8 
…averse input vertices in a consistent order

Signed-off-by: adamperlin <adamp@nanosoft.com>
@adamperlin
Change output->input map name and slight formatting change
9a7d63f 
Signed-off-by: adamperlin <adamp@nanosoft.com>
@adamperlin adamperlin mentioned this pull request Feb 27, 2024
Closed
tonistiigi
tonistiigi reviewed Feb 27, 2024
View reviewed changes
Copy link
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the issue you have pointed out a different place. I think it makes more sense to guarantee that Inputs() always returns consistent results, rather than try to patch this in the specific caller later.

client/llb/state.go Outdated Show resolved Hide resolved
@adamperlin
Remove input ordering logic from Marshal(), enforce ordering in to (*…
3d396e4 
…FileOp).Inputs() and (*ExecOp).Inputs()

Signed-off-by: adamperlin <adamp@nanosoft.com>
@adamperlin
Revert formatting change to state.go
0e68ee0 
Signed-off-by: adamperlin <adamp@nanosoft.com>
@adamperlin
Copy link
Contributor Author

@tonistiigi should be ready for another look. I've revised my fix to address the ordering directly in (*ExecOp).Inputs() and (*FileOp).Inputs

@adamperlin
Remove trailing newline
62fb490 
Signed-off-by: adamperlin <adamp@nanosoft.com>
@adamperlin
Copy link
Contributor Author

adamperlin commented Mar 1, 2024 •
edited
Loading

Not sure what the CI failure is here? Unsure if it's related?

cpuguy83
cpuguy83 reviewed Mar 1, 2024
View reviewed changes
client/llb/exec.go Outdated Show resolved Hide resolved
tonistiigi
tonistiigi reviewed Mar 1, 2024
View reviewed changes
client/llb/exec.go Show resolved Hide resolved
client/llb/exec.go Outdated Show resolved Hide resolved
client/llb/fileop.go Outdated Show resolved Hide resolved
@adamperlin
Address review feedback and slightly refactor tests
e1aa0ce 
Signed-off-by: adamperlin <adamp@nanosoft.com>
@adamperlin
Copy link
Contributor Author

@tonistiigi should be ready for another look

@adamperlin
Copy link
Contributor Author

adamperlin commented Mar 5, 2024 •
edited
Loading

@tonistiigi can we run CI again?

@adamperlin
Copy link
Contributor Author

@tonistiigi CI is passing now, looks like this can be merged?

@tonistiigi tonistiigi merged commit a90ed2b into moby:master Mar 5, 2024
73 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@adamperlin @tonistiigi @cpuguy83