genpolicy: add missing cache improvements #181
Conversation
Add missing cache improvements specifically missing in containerd pull Signed-off-by: Saul Paredes <[email protected]>
| @@ -333,10 +321,10 @@ async fn get_verity_hash( | |||
| } | |||
|
|
|||
| if !error { | |||
| match std::fs::read_to_string(&verity_path) { | |||
| match get_verity_hash_value(&decompressed_path) { | |||
There was a problem hiding this comment.
Following original cache improvements https://github.com/microsoft/kata-containers/pull/113/files#diff-754926dd5feb413b73f033fd1484312752a69e1b24d71fc57e422316b90c587bR307
| @@ -317,14 +308,11 @@ async fn get_verity_hash( | |||
|
|
|||
| if verity_hash.is_empty() { | |||
| // 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.
Following original cache improvements https://github.com/microsoft/kata-containers/pull/113/files#diff-754926dd5feb413b73f033fd1484312752a69e1b24d71fc57e422316b90c587bR291
| @@ -359,74 +347,41 @@ async fn get_verity_hash( | |||
| 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
| @@ -444,25 +399,3 @@ async fn create_decompressed_layer_file( | |||
|
|
|||
| 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
| }; | ||
| 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)
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