Add cleanup task #37
Merged
Add cleanup task #37
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
alejandromumo
commented
Jul 16, 2024
slint
approved these changes
Jul 18, 2024
alejandromumo
force-pushed
the
add_cleanup_task
branch
from
7c36696 to
ab49709
Compare
alejandromumo
commented
Jul 19, 2024
| if not deposit_id: | ||
| raise DepositNotCreated("Deposit id not returned by SWH.") | ||
|
|
||
| deposit = self.record_cls.create(record.id) |
There was a problem hiding this comment.
Moved deposit.create after the deposition is created on remote, otherwise we could end up with a deposition locally that doesn't exist in SWH.
alejandromumo
commented
Jul 19, 2024
| @@ -103,14 +103,9 @@ def sync_status(self, id_, uow=None): | |||
| deposit = deposit_res.deposit | |||
| if not deposit: | |||
| return | |||
| if deposit.status == SWHDepositStatus.FAILED: | |||
There was a problem hiding this comment.
Removed the check from sync_status, otherwise we can't "recover" a deposition. E.g.:
- We create a deposit and start polling its status
- It reaches the max retries for polling, we mark it as
FAILED - Next day we want to sync the deposition status because it might have worked in SWH
alejandromumo
commented
Jul 19, 2024
| current_app.logger.exception("Failed to complete deposit archival.") | ||
| raise | ||
| return |
There was a problem hiding this comment.
re-raising would retry this task, and the task would try to create the deposit again. We don't want that
alejandromumo
commented
Jul 19, 2024
| service.sync_status(deposit.id) | ||
| except Exception as ex: | ||
| # If the sync failed for any reason, set the status to "FAILED" | ||
| try: |
There was a problem hiding this comment.
ugly nested try / catch, but service.update_status can also fail. In that case, we want to continue trying other deposits
alejandromumo
force-pushed
the
add_cleanup_task
branch
from
616777a to
bcdc8b3
Compare
slint
approved these changes
Jul 22, 2024
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.
closes zenodo/zenodo-rdm#937
this needs to be rebased on top of main when #33 is merged