Skip to content
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

Jump to bottom

Fix garbage collection logic for small tables #280

Merged
merged 3 commits into from
May 1, 2018
Merged

Fix garbage collection logic for small tables #280

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb9da70
Fix garbage collection logic for small tables
albertyw Apr 30, 2018
8affeb8
Preempt deletion if target_count is above request count
albertyw Apr 30, 2018
76afd48
Combine if statements
albertyw May 1, 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
2 changes: 2 additions & 0 deletions silk/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ def garbage_collect(cls, force=False):
requests = cls.objects.order_by('-start_time')
if not requests:
return
if len(requests)-1 < target_count:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Couldn't we combine this line with the line above on 149? I know it lengthens the if check with an or but ensures only one return statement.

return
time_cutoff = requests[target_count].start_time
cls.objects.filter(start_time__lte=time_cutoff).delete()

Expand Down