[ARVADOS] created: a4a8d41f6ccd1a0a54f99fb80f3d725922c08ee1
Git user
git at public.curoverse.com
Thu May 4 13:36:00 EDT 2017
at a4a8d41f6ccd1a0a54f99fb80f3d725922c08ee1 (commit)
commit a4a8d41f6ccd1a0a54f99fb80f3d725922c08ee1
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Thu May 4 14:17:54 2017 -0300
10111: Only add cr input collections by PDH.
diff --git a/apps/workbench/app/helpers/provenance_helper.rb b/apps/workbench/app/helpers/provenance_helper.rb
index 62bf7f3..ba5b56c 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -112,10 +112,8 @@ module ProvenanceHelper
input_obj = cr[:mounts].andand[:"/var/lib/cwl/cwl.input.json"].andand[:content] || cr[:mounts] || {}
if input_obj
ProvenanceHelper::find_collections input_obj, 'input' do |col_hash, col_uuid, key|
- if col_uuid
- gr += describe_node(col_uuid)
- gr += edge(col_uuid, uuid, {:label => key})
- else
+ # Only include input PDHs
+ if col_hash
gr += describe_node(col_hash)
gr += edge(col_hash, uuid, {:label => key})
end
commit 11208178d6724a93663139565e9dad96ee7f10a3
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Thu May 4 12:42:19 2017 -0300
10111: Skip log outputs from the provenance graph.
Container request's outputs are now added to the graph by their PDHs so that they connect with the CR childs inputs.
diff --git a/apps/workbench/app/helpers/provenance_helper.rb b/apps/workbench/app/helpers/provenance_helper.rb
index 44acc18..62bf7f3 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -122,13 +122,12 @@ module ProvenanceHelper
end
end
- [
- [:output_uuid, 'output'],
- [:log_uuid, 'log']
- ].each do |attr, label|
- if cr[attr]
- gr += describe_node(cr[attr])
- gr += edge(uuid, cr[attr], {label: label})
+ # Add CR outputs by PDH so they connect with the child CR's inputs.
+ if cr[:output_uuid]
+ output_pdh = Collection.find(cr[:output_uuid])[:portable_data_hash]
+ if output_pdh
+ gr += describe_node(output_pdh)
+ gr += edge(uuid, output_pdh, {label: 'output'})
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list