-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Delete project and organization objects asynchronously #12541
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.
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
Open
stsewd
wants to merge
2
commits into
main
Choose a base branch
from
async-delete
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+73
−6
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,9 +4,13 @@ | |
|
|
||
| import redis | ||
| import structlog | ||
| from django.apps import apps | ||
| from django.conf import settings | ||
| from django.contrib.auth.models import User | ||
| from django.core.mail import EmailMultiAlternatives | ||
|
|
||
| from readthedocs.builds.utils import memcache_lock | ||
| from readthedocs.core.history import set_change_reason | ||
| from readthedocs.worker import app | ||
|
|
||
|
|
||
|
|
@@ -71,3 +75,38 @@ def cleanup_pidbox_keys(): | |
| client.delete(key) | ||
|
|
||
| log.info("Redis pidbox objects.", memory=total_memory, keys=len(keys)) | ||
|
|
||
|
|
||
| @app.task(queue="web", bind=True) | ||
| def delete_object(self, model_name: str, pk: int, user_id: int | None = None): | ||
| """ | ||
| Delete an object from the database asynchronously. | ||
|
|
||
| This is useful for deleting large objects that may take time | ||
| to delete, without timing out the request. | ||
|
|
||
| :param model_name: The model name in the format 'app_label.ModelName'. | ||
| :param pk: The primary key of the object to delete. | ||
| :param user_id: The ID of the user performing the deletion. | ||
| Just for logging purposes. | ||
| """ | ||
| task_log = log.bind(model_name=model_name, object_pk=pk, user_id=user_id) | ||
| lock_id = f"{self.name}-{model_name}-{pk}-lock" | ||
| lock_expire = 60 * 60 * 2 # 2 hours | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe one hour is fine? or less... |
||
| with memcache_lock( | ||
| lock_id=lock_id, lock_expire=lock_expire, app_identifier=self.app.oid | ||
| ) as acquired: | ||
| if not acquired: | ||
| task_log.info("Object is already being deleted.") | ||
| return | ||
|
|
||
| user = User.objects.filter(pk=user_id).first() if user_id else None | ||
| Model = apps.get_model(model_name) | ||
| obj = Model.objects.filter(pk=pk).first() | ||
| if obj: | ||
| task_log.info("Deleting object.") | ||
| set_change_reason(obj, reason="Object deleted asynchronously", user=user) | ||
| obj.delete() | ||
| task_log.info("Object deleted.") | ||
| else: | ||
| task_log.info("Object does not exist.") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.