Skip to content
Snippets Groups Projects
Commit cf2eae95 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

Task #11385: do not retry when sip is invalid. users should fix the sip, and then reingest.

parent 4e5dfaca
No related branches found
No related tags found
No related merge requests found
...@@ -460,8 +460,10 @@ class IngestJobManager: ...@@ -460,8 +460,10 @@ class IngestJobManager:
if next_retry_attempt < self.__max_num_retries: if next_retry_attempt < self.__max_num_retries:
if message and 'not on disk' in message: if message and 'not on disk' in message:
logger.info('job %s transfer failed because source data was not on disk, not retrying anymore', logger.info('job %s transfer failed because source data was not on disk, not retrying anymore', job_id)
job_id) new_status = JobFailed
elif message and 'invalid SIP' in message:
logger.info('job %s transfer failed because the SIP is invalid, not retrying anymore', job_id)
new_status = JobFailed new_status = JobFailed
else: else:
new_status = JobRetry new_status = JobRetry
...@@ -716,7 +718,7 @@ class IngestJobManager: ...@@ -716,7 +718,7 @@ class IngestJobManager:
try: try:
with self.__jobs_for_transfer_queue_peeker: with self.__jobs_for_transfer_queue_peeker:
num_scheduled = self.__jobs_for_transfer_queue_peeker.nr_of_messages_in_queue(0.01) num_scheduled = self.__jobs_for_transfer_queue_peeker.nr_of_messages_in_queue(0.01)
if num_scheduled == 0: if num_scheduled <= 3:
scheduled_jads = self.getJobAdminDicts(status=JobScheduled) scheduled_jads = self.getJobAdminDicts(status=JobScheduled)
return len(scheduled_jads) <= 3 return len(scheduled_jads) <= 3
return False return False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment