Skip to content

Defer no-cache package key computation #28

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
jhuntwork merged 1 commit into from
Aug 7, 2026
Merged

Defer no-cache package key computation #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 45 additions & 16 deletions src/build_orchestrator/packaging.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const PackageArchiveJob = struct {
staged: split_staging.StagedPackage,
output_dir: []const u8,
package_cache_key: []const u8,
has_package_cache_key: bool,
injected_dependencies: []const packaging.InjectedDependency,
};

Expand Down Expand Up @@ -687,24 +688,28 @@ fn packageStagedPackage(
.staged = staged,
.output_dir = output_dir,
.package_cache_key = undefined,
.has_package_cache_key = false,
.injected_dependencies = injected_by_pkg[staged.pkg_index].items.items,
});
const package_key = cache_solver.packageArchiveKey(
job_state.arena.allocator(),
ctx,
parsed_recipe,
artifact,
staging_dir,
injected_by_pkg[staged.pkg_index].items.items,
) catch |err| {
packaging_errors_encountered.* = true;
return switch (err) {
error.OutOfMemory => ctx.fail(error.OutOfMemory, artifact.name, "failed to compute package cache key"),
error.PermissionDenied => ctx.fail(error.PermissionDenied, artifact.name, "failed to compute package cache key"),
else => ctx.fail(error.PackageCreationFailed, artifact.name, "failed to compute package cache key"),
if (cache) {
const package_key = cache_solver.packageArchiveKey(
job_state.arena.allocator(),
ctx,
parsed_recipe,
artifact,
staging_dir,
injected_by_pkg[staged.pkg_index].items.items,
) catch |err| {
packaging_errors_encountered.* = true;
return switch (err) {
error.OutOfMemory => ctx.fail(error.OutOfMemory, artifact.name, "failed to compute package cache key"),
error.PermissionDenied => ctx.fail(error.PermissionDenied, artifact.name, "failed to compute package cache key"),
else => ctx.fail(error.PackageCreationFailed, artifact.name, "failed to compute package cache key"),
};
};
};
job_state.job.package_cache_key = package_key;
job_state.job.package_cache_key = package_key;
job_state.job.has_package_cache_key = true;
}
try package_jobs.append(allocator, job_state);

return true;
Expand Down Expand Up @@ -808,6 +813,30 @@ fn finalizePackageArchiveJob(
emit_package_metadata_report: EmitPackageMetadataReportFn,
package_archive_node_recorder: ?PackageArchiveNodeRecorder,
) PackageError!void {
var owned_package_cache_key: ?[]const u8 = null;
defer if (owned_package_cache_key) |key| allocator.free(key);
const package_cache_key = if (job.has_package_cache_key)
job.package_cache_key
else blk: {
const key = cache_solver.packageArchiveKey(
allocator,
ctx,
parsed_recipe,
job.artifact,
job.staged.staging_dir,
job.injected_dependencies,
) catch |err| {
packaging_errors_encountered.* = true;
return switch (err) {
error.OutOfMemory => ctx.fail(error.OutOfMemory, job.artifact.name, "failed to compute package cache key"),
error.PermissionDenied => ctx.fail(error.PermissionDenied, job.artifact.name, "failed to compute package cache key"),
else => ctx.fail(error.PackageCreationFailed, job.artifact.name, "failed to compute package cache key"),
};
};
owned_package_cache_key = key;
break :blk key;
};

job.artifact.markBuilt(allocator, result.archive_path, result.content_hash, result.archive_hash, result.signature) catch {
packaging_errors_encountered.* = true;
return ctx.fail(error.PackageCreationFailed, job.artifact.name, "failed to record package metadata");
Expand Down Expand Up @@ -859,7 +888,7 @@ fn finalizePackageArchiveJob(
);

if (package_archive_node_recorder) |recorder| {
recorder.record(.executed, job.package_cache_key, result.archive_hash) catch {
recorder.record(.executed, package_cache_key, result.archive_hash) catch {
packaging_errors_encountered.* = true;
return ctx.fail(error.OutOfMemory, job.artifact.name, "failed to record package archive node");
};
Expand Down