diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py index 9606c617023cdff038dcc06b461eaf59d7bd86c1..28e97c387d9a6174f6733c1bbb5ef4f80a2d4c37 100755 --- a/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py +++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py @@ -356,8 +356,8 @@ class LtaCp: current_progress_time = datetime.utcnow() elapsed_secs_since_prev = totalSeconds(current_progress_time - prev_progress_time) - if elapsed_secs_since_prev > 120: - raise LtacpException('ltacp %s: transfer stalled.' % (self.logId)) + if elapsed_secs_since_prev > 300: + raise LtacpException('ltacp %s: transfer stalled for 5min.' % (self.logId)) # read and process md5a32bc stdout lines to create progress messages lines = pipe_reader.readlines(1) @@ -400,7 +400,7 @@ class LtaCp: except LtacpException as e: logger.error('ltacp %s: %s' % (self.logId, str(e))) self.cleanup() - return + raise except Exception as e: logger.error('ltacp %s: %s' % (self.logId, str(e))) diff --git a/SAS/DataManagement/Cleanup/CleanupService/service.py b/SAS/DataManagement/Cleanup/CleanupService/service.py index 7d56f47f1c793738c19d38dc33a6086d3e8bfbae..558ad04bb32b7c93f64c686dcc738e3a95aa68cd 100644 --- a/SAS/DataManagement/Cleanup/CleanupService/service.py +++ b/SAS/DataManagement/Cleanup/CleanupService/service.py @@ -178,7 +178,7 @@ class CleanupHandler(MessageHandlerInterface): momrpc = self.path_resolver.momrpc dataproducts = momrpc.getDataProducts(task['mom_id']).get(task['mom_id']) - ingestable_dataproducts = [dp for dp in dataproducts if dp['status'] not in [None, 'has_data', 'no_data', 'aborted', 'populated'] ] + ingestable_dataproducts = [dp for dp in dataproducts if dp['status'] not in [None, 'has_data', 'no_data', 'populated'] ] ingested_dataproducts = [dp for dp in ingestable_dataproducts if dp['status'] == 'ingested'] if len(ingestable_dataproducts) > 0 and len(ingested_dataproducts) < len(ingestable_dataproducts) : diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py index 18a0804aa3765d07eec47b33cdf24e7a7346a8a7..83c2dd85c2950017679c65e00f9bdf996dbfbec0 100755 --- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py +++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py @@ -486,7 +486,7 @@ class RAtoOTDBTranslator(): parset[PREFIX+'ObservationControl.OnlineControl.inspectionProgram'] = 'inspection-plots-observation.sh' #special case for dynspec projects for Richard Fallows - if project_name in ['LC6_001','IPS_Commissioning', 'LC7_001']: + if project_name in ['LC6_001','IPS_Commissioning', 'LC7_001', 'LC8_001']: logging.info("CreateParset: Overwriting inspectionProgram parset key for dynspec") parset[PREFIX+'ObservationControl.OnlineControl.inspectionProgram'] = '/data/home/lofarsys/dynspec/scripts/inspection-dynspec-observation.sh' diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py index 41627a5257e26a7e77b2c98bedd7a40cbecd37d9..f482e6296a65aed1d7c94abd7176c8b45b39cc61 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py @@ -106,7 +106,7 @@ def updateTaskMomDetails(task, momrpc): elif dp['status'] == 'aborted': num_ingest_aborted += 1 - ingestable_dataproducts = [dp for dp in dps if dp['status'] not in [None, 'has_data', 'no_data', 'aborted', 'populated'] ] + ingestable_dataproducts = [dp for dp in dps if dp['status'] not in [None, 'has_data', 'no_data', 'populated'] ] if num_ingested > 0 and num_ingested == len(ingestable_dataproducts): t['ingest_status'] = 'ingested'