-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Add admin methods for reindexing versions from project and version admin. #5343
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
Merged
ericholscher
merged 7 commits into
readthedocs:master
from
dojutsu-user:admin-reindexing
Feb 27, 2019
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cda474d
Add admin methods
dojutsu-user 08301dc
add else
dojutsu-user 2dcb568
add another else
dojutsu-user caaac0a
Change short_description
dojutsu-user f6228d1
Merge branch 'master' into admin-reindexing
dojutsu-user a54937d
add improvements
dojutsu-user b946106
Merge branch 'admin-reindexing' of https://github.com/dojutsu-user/re…
dojutsu-user 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 |
---|---|---|
|
@@ -8,7 +8,8 @@ | |
from django_elasticsearch_dsl.registries import registry | ||
|
||
from readthedocs.builds.models import Version | ||
from readthedocs.projects.models import Project | ||
from readthedocs.projects.models import Project, HTMLFile | ||
from readthedocs.search.documents import PageDocument | ||
|
||
|
||
log = logging.getLogger(__name__) | ||
|
@@ -67,3 +68,25 @@ def _get_document(model, document_class): | |
for document in documents: | ||
if str(document) == document_class: | ||
return document | ||
|
||
|
||
def _indexing_helper(html_objs, wipe=False): | ||
""" | ||
Helper function for reindexing and wiping indexes of projects and versions. | ||
|
||
If ``wipe`` is set to False, html_objs are deleted from the ES index, | ||
else, html_objs are indexed. | ||
""" | ||
from readthedocs.search.tasks import index_objects_to_es, delete_objects_in_es | ||
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. This should check if 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. I have added the checks to prevent this. |
||
|
||
kwargs = { | ||
'app_label': HTMLFile._meta.app_label, | ||
'model_name': HTMLFile.__name__, | ||
'document_class': str(PageDocument), | ||
'objects_id': [obj.id for obj in html_objs], | ||
} | ||
|
||
if not wipe: | ||
index_objects_to_es.delay(**kwargs) | ||
else: | ||
delete_objects_in_es.delay(**kwargs) |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is reindexing a number of times, it should build a list of all the files and then pass it once.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you.
I have made and pushed the changes.