Skip to content

Artifact cache fixes #2091

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
juergbi merged 3 commits into from
Nov 21, 2025
Merged

Artifact cache fixes #2091

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cea83a
_artifactcache.py: Fix presence checks of protobuf digest fields
juergbi Nov 14, 2025
2013156
_artifactcache.py: Add `public_data` to list of referenced blobs
juergbi Nov 14, 2025
d3e8844
_artifactcache.py: Push and fetch sources
juergbi Nov 14, 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
41 changes: 26 additions & 15 deletions src/buildstream/_artifactcache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,28 +288,34 @@ def _push_artifact_blobs(self, artifact, artifact_digest, remote):
artifact_proto = artifact._get_proto()

try:
if str(artifact_proto.files):
if artifact_proto.HasField("files"):
self.cas._send_directory(remote, artifact_proto.files)

if str(artifact_proto.buildtree):
if artifact_proto.HasField("buildtree"):
try:
self.cas._send_directory(remote, artifact_proto.buildtree)
except FileNotFoundError:
pass

if str(artifact_proto.buildroot):
if artifact_proto.HasField("sources"):
try:
self.cas._send_directory(remote, artifact_proto.sources)
except FileNotFoundError:
pass

if artifact_proto.HasField("buildroot"):
try:
self.cas._send_directory(remote, artifact_proto.buildroot)
except FileNotFoundError:
pass

if artifact_proto.buildsandbox:
if artifact_proto.HasField("buildsandbox"):
for subsandbox_digest in artifact_proto.buildsandbox.subsandbox_digests:
self.cas._send_directory(remote, subsandbox_digest)

digests = [artifact_digest, artifact_proto.low_diversity_meta, artifact_proto.high_diversity_meta]

if str(artifact_proto.public_data):
if artifact_proto.HasField("public_data"):
digests.append(artifact_proto.public_data)

for log_file in artifact_proto.logs:
Expand Down Expand Up @@ -357,22 +363,25 @@ def _push_artifact_proto(self, element, artifact, artifact_digest, remote):
raise ArtifactError("{}".format(e), temporary=True) from e

referenced_directories = []
if artifact_proto.files:
if artifact_proto.HasField("files"):
referenced_directories.append(artifact_proto.files)
if artifact_proto.buildtree:
if artifact_proto.HasField("buildtree"):
referenced_directories.append(artifact_proto.buildtree)
if artifact_proto.sources:
if artifact_proto.HasField("sources"):
referenced_directories.append(artifact_proto.sources)
if artifact_proto.buildroot:
if artifact_proto.HasField("buildroot"):
referenced_directories.append(artifact_proto.buildroot)
if artifact_proto.buildsandbox:
if artifact_proto.HasField("buildsandbox"):
for subsandbox_digest in artifact_proto.buildsandbox.subsandbox_digests:
referenced_directories.append(subsandbox_digest)

referenced_blobs = [artifact_proto.low_diversity_meta, artifact_proto.high_diversity_meta] + [
log_file.digest for log_file in artifact_proto.logs
]

if artifact_proto.HasField("public_data"):
referenced_blobs.append(artifact_proto.public_data)

try:
remote.push_blob(
uris,
Expand Down Expand Up @@ -418,20 +427,22 @@ def _pull_artifact_storage(self, element, key, artifact_digest, remote, pull_bui
with utils.save_file_atomic(artifact_path, mode="wb") as f:
f.write(artifact.SerializeToString())

if str(artifact.files):
if artifact.HasField("files"):
self.cas.fetch_directory(remote, artifact.files)

if pull_buildtrees:
if str(artifact.buildtree):
if artifact.HasField("buildtree"):
self.cas.fetch_directory(remote, artifact.buildtree)
if str(artifact.buildroot):
if artifact.HasField("sources"):
self.cas.fetch_directory(remote, artifact.sources)
if artifact.HasField("buildroot"):
self.cas.fetch_directory(remote, artifact.buildroot)
if artifact.buildsandbox:
if artifact.HasField("buildsandbox"):
for subsandbox_digest in artifact.buildsandbox.subsandbox_digests:
self.cas.fetch_directory(remote, subsandbox_digest)

digests = [artifact.low_diversity_meta, artifact.high_diversity_meta]
if str(artifact.public_data):
if artifact.HasField("public_data"):
digests.append(artifact.public_data)

for log_digest in artifact.logs:
Expand Down
Loading