Cancel or delete stale pending and failed exports #1086
Merged
Conversation
This file contains 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
Fixes: #1068 Create periodic tasks which: - Find old pending exports and mark them as failed. - Find old failed exports and delete them The 'oldness' is determined by a configurable setting.
ukanga
requested changes
Aug 9, 2017
onadata/apps/viewer/tasks.py
Outdated
| Delete old failed exports | ||
| """ | ||
| h = settings.EXPORT_TASK_LIFESPAN | ||
| time_threshold = datetime.now() - timedelta(hours=h) |
There was a problem hiding this comment.
You should probably use the time zone aware django.utils.timezone.now().
The h could probably be more descriptive like task_lifespan.
onadata/apps/viewer/tasks.py
Outdated
| exports = Export.objects.filter(internal_status=Export.FAILED, | ||
| created_on__lt=time_threshold) | ||
| for export in exports: | ||
| delete_export.delay(export.id) |
There was a problem hiding this comment.
Is there a reason you chose to delete the export in a different task considering this is already task? Possible use queryset deletion, exports.delet().
There was a problem hiding this comment.
I had seen that there was a task created to specifically delete exports that was used elsewhere, and so I chose to use it - to keep things consistent.
|
|
||
| def test_check_pending_exports(self): | ||
| result = check_pending_exports.delay() | ||
| self.assertTrue(result) |
There was a problem hiding this comment.
We should probably check that the function deletes exports and not that a task is created.
There was a problem hiding this comment.
Agree. And implemented.
Improve tests to not only test that the celery tasks below are working: - onadata.apps.viewer.tasks.check_pending_exports - onadata.apps.viewer.tasks.delete_old_failed_exports But also test that they have the desired effect on pending and failed exports, respectively.
ukanga
changed the title
ukanga
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #1068
Create periodic tasks which:
Find old pending exports and mark them as failed.
Find old failed exports and delete them
The 'oldness' is determined by a configurable setting.