Skip to content

Don't hard-cap EventMapping retention at 7d. #6887

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
JTCunning merged 3 commits into from
Jan 9, 2018
Merged

Don't hard-cap EventMapping retention at 7d. #6887

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77aec22
Don't hard-cap EventMapping retention at 7d.
Jan 5, 2018
28be8a9
Move EventMapping to vanilla BulkDeleteQuery.
Jan 5, 2018
288d499
Add order_by clause to bulk delete EventMapping.
Jan 8, 2018
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
17 changes: 1 addition & 16 deletions src/sentry/runner/commands/cleanup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ def is_filtered(model):
# Deletions that use `BulkDeleteQuery` (and don't need to worry about child relations)
# (model, datetime_field, order_by)
BULK_QUERY_DELETES = [
(models.EventMapping, 'date_added', '-date_added'),
(models.GroupEmailThread, 'date', None),
(models.GroupRuleStatus, 'date_added', None),
] + EXTRA_BULK_QUERY_DELETES
Expand Down Expand Up @@ -321,22 +322,6 @@ def is_filtered(model):
days, project_id, model, dtfield, order_by)
_chunk_until_complete(task)

# EventMapping is fairly expensive and is special cased as it's likely you
# won't need a reference to an event for nearly as long
if not silent:
click.echo("Removing expired values for EventMapping")
if is_filtered(models.EventMapping):
if not silent:
click.echo('>> Skipping EventMapping')
else:
BulkDeleteQuery(
model=models.EventMapping,
dtfield='date_added',
days=min(days, 7),
project_id=project_id,
order_by='-date_added'
).execute()

# Clean up FileBlob instances which are no longer used and aren't super
# recent (as there could be a race between blob creation and reference)
if not silent:
Expand Down