genpolicy: add missing cache improvements #181
Merged
Conversation
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
Add missing cache improvements specifically missing in containerd pull Signed-off-by: Saul Paredes <[email protected]>
Redent0r
commented
Apr 22, 2024
|
|
||
| if !error { | ||
| match std::fs::read_to_string(&verity_path) { | ||
| match get_verity_hash_value(&decompressed_path) { |
There was a problem hiding this comment.
Redent0r
commented
Apr 22, 2024
| // go find verity hash if not found in cache | ||
| if let Err(e) = create_verity_hash_file( | ||
| use_cached_files, | ||
| if let Err(e) = create_decompressed_layer_file( |
There was a problem hiding this comment.
Redent0r
commented
Apr 22, 2024
| Ok(verity_hash) | ||
| } | ||
|
|
||
| async fn create_verity_hash_file( |
There was a problem hiding this comment.
No longer need create_verity_hash_file after cache improvements. Now we call create_decompressed_layer_file directly https://github.com/microsoft/kata-containers/pull/113/files#diff-754926dd5feb413b73f033fd1484312752a69e1b24d71fc57e422316b90c587bL329
Redent0r
commented
Apr 22, 2024
| Ok(()) | ||
| } | ||
|
|
||
| fn do_create_verity_hash_file(path: &Path, verity_path: &Path) -> Result<()> { |
There was a problem hiding this comment.
We no longer need this and instead reuse get_verity_hash_value from registry.rs
Redent0r
commented
Apr 22, 2024
| }; | ||
| let req = with_namespace!(req, "k8s.io"); | ||
| let mut c = client.content(); | ||
| let resp = c.read(req).await?; |
There was a problem hiding this comment.
This is the reason we can't reuse create_decompressed_layer_file and other adjacent methods from registry.rs. Here we fetch the content in a different way (using containerd_client)
danmihai1
approved these changes
Apr 23, 2024
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.
Merge Checklist
upstream-missinglabel (orupstream-not-needed) has been set on the PR.Summary
Add missing cache improvements specifically missing in containerd pull. I'm not sure how I missed this: It was already using layers-cache.json and it produces the exact same cache after using these changes.
These improvements are already included in kata-containers#9530 and based on #113
Test Methodology
https://dev.azure.com/mariner-org/mariner/_build/results?buildId=555763&view=results