Merge branch '3187-start-finish-timestamps-tasks-pipelines' into 3187-pipeline-instan...

[arvados.git] / sdk / cli / bin / arv-run-pipeline-instance

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index c2e0145ab7e7236822e5fa16da430ca484cf872d..b19bf04dd6534f5650f97a39034a565d3f843969 100755 (executable)
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -495,6 +495,10 @@ class WhRunPipelineInstance
     moretodo = true
     interrupted = false
 
+    if @instance[:started_at].nil?
+      @instance[:started_at] = Time.now
+    end
+
     job_creation_failed = 0
     while moretodo
       moretodo = false
@@ -569,25 +573,45 @@ class WhRunPipelineInstance
                 fetch_template(@instance[:pipeline_template_uuid])
                 pipeline_name = @template[:name]
               end
-              output_name = c[:output_name] || "Output of #{cname} of #{pipeline_name}"
-              # Create a collection located in the same project as the pipeline with the contents of the output.
-              portable_data_hash = c[:job][:output]
-              collections = $arv.collection.list(limit: 1,
-                                                 filters: [['portable_data_hash', '=', portable_data_hash]],
-                                                 select: ["portable_data_hash", "manifest_text"]
-                                                 )[:items]
-              if collections.any?
-                newcollection = {
-                  owner_uuid: owner_uuid,
-                  name: "#{output_name} at #{c[:job][:finished_at]}",
-                  portable_data_hash: collections.first[:portable_data_hash],
-                  manifest_text: collections.first[:manifest_text]
-                }
-                debuglog "Creating collection #{newcollection}", 0
-                newcollection_actual = $arv.collection.create collection: newcollection
-                c[:output_uuid] = newcollection_actual[:uuid]
-              else
-                debuglog "Could not find a collection with portable data hash #{portable_data_hash}", 0
+              if c[:output_name] != false
+                # Create a collection located in the same project as the pipeline with the contents of the output.
+                portable_data_hash = c[:job][:output]
+                collections = $arv.collection.list(limit: 1,
+                                                   filters: [['portable_data_hash', '=', portable_data_hash]],
+                                                   select: ["portable_data_hash", "manifest_text"]
+                                                   )[:items]
+                if collections.any?
+                  name = c[:output_name] || "Output #{portable_data_hash[0..7]} of #{cname} of #{pipeline_name}"
+
+                  # check if there is a name collision.
+                  name_collisions = $arv.collection.list(filters: [["owner_uuid", "=", owner_uuid],
+                                                                   ["name", "=", name]])[:items]
+
+                  newcollection_actual = nil
+                  if name_collisions.any? and name_collisions.first[:portable_data_hash] == portable_data_hash
+                    # There is already a collection with the same name and the
+                    # same contents, so just point to that.
+                    newcollection_actual = name_collisions.first
+                  end
+
+                  if newcollection_actual.nil?
+                    # Did not find a collection with the same name (or the
+                    # collection has a different portable data hash) so create
+                    # a new collection with ensure_unique_name: true.
+                    newcollection = {
+                      owner_uuid: owner_uuid,
+                      name: name,
+                      portable_data_hash: collections.first[:portable_data_hash],
+                      manifest_text: collections.first[:manifest_text]
+                    }
+                    debuglog "Creating collection #{newcollection}", 0
+                    newcollection_actual = $arv.collection.create collection: newcollection, ensure_unique_name: true
+                  end
+
+                  c[:output_uuid] = newcollection_actual[:uuid]
+                else
+                  debuglog "Could not find a collection with portable data hash #{portable_data_hash}", 0
+                end
               end
             end
           elsif c[:job][:running] ||
@@ -659,6 +683,10 @@ class WhRunPipelineInstance
       end
     end
 
+    if @instance[:finished_at].nil? and ['Complete', 'Failed'].include? @instance[:state]
+      @instance[:finished_at] = Time.now
+    end
+
     debuglog "pipeline instance state is #{@instance[:state]}"
 
     # set components_summary
@@ -722,6 +750,7 @@ class WhRunPipelineInstance
       if ["New", "Ready", "RunningOnClient",
           "RunningOnServer"].include?(@instance[:state])
         @instance[:state] = "Failed"
+        @instance[:finished_at] = Time.now
         @instance.save
       end
       @instance.log_stderr(msg)