Support for edge not found skipped action

nuvla · Dec 18, 2024 · 6b174da · 6b174da
1 parent cb9a2fa
commit 6b174da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/nuvla/job_engine/job/actions/utils/bulk_action.py b/nuvla/job_engine/job/actions/utils/bulk_action.py
@@ -67,9 +67,9 @@ def _unsuccessful_action(self, reason, category, resource_id, resource_name, mes
         if message:
             self._error_reasons[reason]['data'][resource_id]['message'] = message
 
-    def skip_action(self, reason: str, resource_id='unknown', resource_name=None):
+    def skip_action(self, reason: str, resource_id='unknown', resource_name=None, message=None):
         self._skipped_count += 1
-        self._unsuccessful_action(reason, 'skipped',  resource_id, resource_name)
+        self._unsuccessful_action(reason, 'skipped',  resource_id, resource_name, message)
 
     def fail_action(self, reason: str, resource_id='unknown', resource_name=None, message=None):
         self._failed_count += 1
@@ -181,7 +181,7 @@ def try_action(self, todo_el):
             else:
                 raise ActionCallException(f'Unexpected action response status {status}', context=todo_el)
         except SkippedActionException as ex:
-            self.result.skip_action(ex.reason, ex.resource_id, ex.resource_name)
+            self.result.skip_action(ex.reason, ex.resource_id, ex.resource_name, ex.message)
             self.log.error(repr(ex))
         except ActionCallException as ex:
             self.result.fail_action(ex.reason, ex.resource_id, ex.resource_name, ex.message)

diff --git a/nuvla/job_engine/job/actions/utils/bulk_deployment_set_apply.py b/nuvla/job_engine/job/actions/utils/bulk_deployment_set_apply.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
+from pyexpat.errors import messages
 
-from .bulk_action import ActionCallException, ActionException
-from ..utils.bulk_action import BulkAction, SkippedActionException
+from .bulk_action import ActionCallException, ActionException, BulkAction, SkippedActionException
 
 
 def get_dg_owner_api(job):
@@ -26,8 +26,8 @@ def _get_edge(self, target):
         if not edge:
             try:
                 edge = self.dg_owner_api.get(target).data
-            except Exception:
-                edge = {}
+            except Exception as ex:
+                raise SkippedActionException('Edge not found', resource_id=target, message=str(ex))
             self.edges[target] = edge
         return edge
 

diff --git a/nuvla/job_engine/job/distributions/monitor_bulk_jobs.py b/nuvla/job_engine/job/distributions/monitor_bulk_jobs.py
@@ -15,7 +15,7 @@ class MonitorBulkJobsDistributor(DistributionBase):
 
     def __init__(self, distributor):
         super(MonitorBulkJobsDistributor, self).__init__(self.DISTRIBUTION_NAME, distributor)
-        self.collect_interval = 60
+        self.collect_interval = 30
         self._start_distribution()
 
     def job_exists(self, job):