From 59d557a2056c1a27a4fa7b004d394a99402dbd27 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 2 Mar 2017 07:49:13 +0000
Subject: [PATCH] Task #10339: yet another mom dp status to take into account
when counting ingestable dataproducts
---
.../ResourceAssignmentEditor/lib/mom.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
index 8b9ea654463..8ec68739deb 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/mom.py
@@ -91,6 +91,7 @@ def updateTaskMomDetails(task, momrpc):
num_ingest_running = 0
num_ingest_failed = 0
num_ingest_hold = 0
+ num_ingest_aborted = 0
for dp in dps:
if dp['status'] == 'ingested':
num_ingested += 1
@@ -102,14 +103,16 @@ def updateTaskMomDetails(task, momrpc):
num_ingest_failed += 1
elif dp['status'] == 'on_hold':
num_ingest_hold += 1
+ 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'] ]
+ ingestable_dataproducts = [dp for dp in dps if dp['status'] not in [None, 'has_data', 'no_data'] ]
- if ingestable_dataproducts > 0 and num_ingested == len(ingestable_dataproducts):
+ if num_ingested > 0 and num_ingested == len(ingestable_dataproducts):
t['ingest_status'] = 'ingested'
elif num_ingest_pending + num_ingest_running > 0:
t['ingest_status'] = 'ingesting'
- elif num_ingest_failed + num_ingest_hold > 0:
+ elif num_ingest_failed + num_ingest_aborted + num_ingest_hold > 0:
t['ingest_status'] = 'failed'
except Exception as e:
--
GitLab