feat(preprod): Delete snapshot objectstore data on artifact deletion by NicoHinderling · Pull Request #111972 · getsentry/sentry

NicoHinderling · 2026-04-01T00:37:52Z

Adds objectstore cleanup to the artifact deletion path in delete_artifacts_and_eap_data.

Previously, only DB records and EAP trace data were cleaned up when deleting preprod artifacts. Snapshot images, manifests, comparison manifests, and diff masks stored in objectstore were left to expire via 30-day TTL — meaning deleted snapshot data remained accessible for up to a month.

Now, before the DB cascade runs, we read each snapshot's manifest to discover all associated objectstore keys (individual images by content hash, the manifest itself, comparison manifests, and diff mask PNGs), deduplicate them, and delete them in parallel using ContextPropagatingThreadPoolExecutor(max_workers=8). Individual key deletion failures are logged but non-blocking since TTL expiration serves as the fallback.

The implementation is split into three module-level functions:

_collect_snapshot_objectstore_keys — queries snapshot metrics and comparisons, reads manifests to enumerate all keys
_delete_objectstore_key — thread worker that deletes a single key
_delete_snapshot_objectstore_data — orchestrator that deduplicates keys and dispatches parallel deletes

Previously, delete_artifacts_and_eap_data only cleaned up DB records and EAP trace data. Snapshot images, manifests, comparison manifests, and diff masks stored in objectstore were left to expire via 30-day TTL. This adds objectstore cleanup to the deletion path: before the DB cascade, we read manifests to discover all associated keys (images, diff masks, comparison data) and delete them in parallel via a thread pool. Failures are logged but non-blocking since TTL is the fallback. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

src/sentry/preprod/helpers/deletion.py

Image keys are content-addressed and shared across snapshots in the same project. Eagerly deleting them when one artifact is removed breaks image display for other active snapshots referencing the same content_hash. Images already expire via 30-day objectstore TTL. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

src/sentry/preprod/helpers/deletion.py

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

src/sentry/preprod/helpers/deletion.py

Move objectstore key collection before bulk_delete_artifacts so DB records are never left pointing at already-deleted objectstore data. Previously, objectstore data was deleted first — if the subsequent DB deletion failed, snapshots and comparisons would reference missing keys. Now the flow is: collect keys → delete DB records → delete objectstore keys. TTL expiry still serves as fallback if objectstore deletes fail. Co-Authored-By: Claude Opus 4.6 <noreply@example.com>

github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Apr 1, 2026

NicoHinderling marked this pull request as ready for review April 1, 2026 00:39

NicoHinderling requested a review from a team as a code owner April 1, 2026 00:39

vercel bot deployed to Preview April 1, 2026 00:40 View deployment