From 7aa27487984e8a0bc8bcbb1a8b956659f9062e6d Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 9 Jun 2016 13:51:59 +0000
Subject: [PATCH] Task #8887: put task to conflict if not all claims could be
 inserted

---
 SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
index d12766c78d1..0a4fb1ca968 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
@@ -202,6 +202,10 @@ class ResourceAssigner():
                 self._sendNotification(task, 'scheduled')
 
             self.processPredecessors(specification_tree)
+        else:
+            logger.warning('doAssignment: Not all claims could be inserted. Setting task %s status to conflict' % (taskId))
+            self.radbrpc.updateTask(taskId, status='conflict')
+            self._sendNotification(task, 'conflict')
 
     def _sendNotification(self, task, status):
         try:
-- 
GitLab