Skip to content

Commit

Permalink
Merge branch 'fix-dlg-submit'
Browse files Browse the repository at this point in the history
Signed-off-by: Rodrigo Tobar <rtobar@icrar.org>
  • Loading branch information
rtobar committed Jun 14, 2022
2 parents a68f816 + 8f95c9f commit 07eb7f8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions daliuge-common/dlg/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,17 @@ def get_roots(pg_spec):
nonroots = set()
for dropspec in pg_spec:

# Assumed to be reprodata / other non-drop elements
#
# TODO (rtobar): Note that this should be a temporary measure.
# In principle the pg_spec given here should be a graph, which (until
# recently) consisted on drop specifications only. The fact that repro
# data is now appended at the end of some graphs highlights the need for
# a more formal specification of graphs and other pieces of data that we
# move through the system.
if "oid" not in dropspec:
continue

oid = dropspec["oid"]
all_oids.add(oid)

Expand Down
2 changes: 1 addition & 1 deletion daliuge-engine/dlg/deploy/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def submit(
"""
client = _get_client(host, port, timeout)
session_id = session_id or "%f" % (time.time())
completed_uids = droputils.get_roots(pg[:-1])
completed_uids = droputils.get_roots(pg)
with client:
client.create_session(session_id)
logger.info("Session %s created", session_id)
Expand Down

0 comments on commit 07eb7f8

Please sign in to comment.