From 3da13e9c15419efd80466f775eff6c67d1ddec96 Mon Sep 17 00:00:00 2001 From: Phil Owen <19691521+PhillipsOwen@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:57:02 -0500 Subject: [PATCH 1/2] Correcting situation where a workflow doesnt exist in all 3 namespaces. --- src/server.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server.py b/src/server.py index 21303b3..133c4eb 100644 --- a/src/server.py +++ b/src/server.py @@ -104,6 +104,10 @@ async def get_all_sv_component_versions() -> json: wf_steps_0 = results[1].get(ref_type) wf_steps_1 = results[2].get(ref_type) + # if the workflow doesnt exist in each namespace skip the comparison + if wf_steps_0 is None or wf_steps_1 is None: + continue + # init the output of the namespace results image_list: list = [] From 48e2b822edb99163ab3c1c893007393a1e9dc574 Mon Sep 17 00:00:00 2001 From: Phil Owen <19691521+PhillipsOwen@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:32:49 -0500 Subject: [PATCH 2/2] correcting the default job ordering for ecflow runs --- src/common/pg_impl.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/pg_impl.py b/src/common/pg_impl.py index c4516d6..63b3bb3 100644 --- a/src/common/pg_impl.py +++ b/src/common/pg_impl.py @@ -92,13 +92,14 @@ def reset_job_order(self, workflow_type_name: str) -> bool: # ------------------------- '101, 23', # staging '104, 30', # adcirc2cog-tiff - '111, 25', # adcirc-to-kalpana-cog + '111, 27', # adcirc-to-kalpana-cog + '108, 25', # ast-run-harvester '106, 24', # obs-mod-ast - '112, 21', # timeseries_ingest - '105, 19', # geotiff2cog + '105, 31', # geotiff2cog + '112, 19', # timeseriesdb-ingest '102, 29', # load-geo-server '110, 20', # collab-data-sync - '103, 21' # final-staging + '103, 21' # final-staging ], 'HECRAS': [ '201, 21', # load geo server step