Skip to content

ensure blob directory exists in archives #77

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

Merged
gjcolombo merged 2 commits into from
Apr 28, 2025
Merged

ensure blob directory exists in archives #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fff790
ensure blob directory exists in archive
gjcolombo Apr 28, 2025
a0e6bbf
only add blob directory if we really need it
gjcolombo Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "omicron-zone-package"
version = "0.12.1"
version = "0.12.2"
authors = ["Sean Klein <sean@oxidecomputer.com>"]
edition = "2021"
rust-version = "1.81.0"
Expand Down
25 changes: 20 additions & 5 deletions src/package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,15 +603,30 @@ impl Package {
fn get_blobs_inputs(&self, download_directory: &Utf8Path, zoned: bool) -> Result<BuildInputs> {
let mut inputs = BuildInputs::new();

// If there are no blobs in the source description, there's no work to
// do. It's important to short-circuit here to avoid adding an empty
// blob directory entry to zone archives that won't actually contain
// any blobs.
if self.source.blobs().is_none() && self.source.buildomat_blobs().is_none() {
return Ok(inputs);
}

let destination_path = if zoned {
zone_archive_path(
&Utf8Path::new("/opt/oxide")
.join(self.service_name.as_str())
.join(BLOB),
)?
let dst = Utf8Path::new("/opt/oxide")
.join(self.service_name.as_str())
.join(BLOB);

inputs.0.extend(
Copy link
Collaborator

@smklein smklein Apr 28, 2025

Choose a reason for hiding this comment

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

I believe tests are failing because we're adding these directories, even if no blob inputs actually exist

Copy link
Collaborator

@smklein smklein Apr 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

The following change works for me:

     fn get_blobs_inputs(&self, download_directory: &Utf8Path, zoned: bool) -> Result<BuildInputs> {
         let mut inputs = BuildInputs::new();
 
+        let s3_blobs = self.source.blobs();
+        let buildomat_blobs = self.source.buildomat_blobs();
+        let any_blobs = s3_blobs.is_some() || buildomat_blobs.is_some();
+
         let destination_path = if zoned {
-            zone_archive_path(
-                &Utf8Path::new("/opt/oxide")
-                    .join(self.service_name.as_str())
-                    .join(BLOB),
-            )?
+            let dst = Utf8Path::new("/opt/oxide")
+                .join(self.service_name.as_str())
+                .join(BLOB);
+
+            // Add the parent input directories to ensure they exist
+            // before adding the blobs themeselves.
+            //
+            // However, only do this work if the blobs actually exist.
+            if any_blobs {
+                inputs.0.extend(
+                    zone_get_all_parent_inputs(&dst)?
+                        .into_iter()
+                        .map(BuildInput::AddDirectory),
+                );
+            }
+
+            zone_archive_path(&dst)?
         } else {
             Utf8PathBuf::from(BLOB)
         };
-        if let Some(s3_blobs) = self.source.blobs() {
+        if let Some(s3_blobs) = s3_blobs {
...
-        if let Some(buildomat_blobs) = self.source.buildomat_blobs() {
+        if let Some(buildomat_blobs) = buildomat_blobs {

Copy link
Contributor Author

@gjcolombo gjcolombo Apr 28, 2025

Choose a reason for hiding this comment

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

Thanks! Fixed in a0e6bbf, though I opted just to short-circuit the entire routine if there are no blobs to add. Let me know if you'd prefer an approach like the one you've outlined--I mostly went with short-circuiting because it seemed a bit sad to go through all the path computations unconditionally only to find out that we'll never use them because there's nothing to add.

zone_get_all_parent_inputs(&dst)?
.into_iter()
.map(BuildInput::AddDirectory),
);

zone_archive_path(&dst)?
} else {
Utf8PathBuf::from(BLOB)
};

if let Some(s3_blobs) = self.source.blobs() {
inputs.0.extend(s3_blobs.iter().map(|blob| {
let from = download_directory
Expand Down
Loading