X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0042e4b42d9f4d3900aefc68617cb28c5a61a522..452baf1ec1b55c6c4613972ee5f6b5ebf28e8ed7:/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 101b4ee622..c6fd61f9e3 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -42,6 +42,8 @@
 # [--status-json path] Print JSON status report to a file or
 #                      fifo. Default: /dev/null
 #
+# [--description] Description for the pipeline instance.
+#
 # == Parameters
 #
 # [param_name=param_value]
@@ -175,6 +177,10 @@ p = Trollop::Parser.new do
       "Manage the pipeline in process.",
       :short => :none,
       :type => :boolean)
+  opt(:description,
+      "Description for the pipeline instance.",
+      :short => :none,
+      :type => :string)
   stop_on [:'--']
 end
 $options = Trollop::with_standard_exception_handling p do
@@ -478,6 +484,8 @@ class WhRunPipelineInstance
         end
       end
     else
+      description = $options[:description]
+      description = ("Created at #{Time.now.localtime}" + (@template[:name].andand.size>0 ? " using the pipeline template *#{@template[:name]}*" : "")) if !description
       @instance = PipelineInstance.
         create(components: @components,
                properties: {
@@ -486,6 +494,7 @@ class WhRunPipelineInstance
                  }
                },
                pipeline_template_uuid: @template[:uuid],
+               description: description,
                state: ($options[:submit] ? 'RunningOnServer' : 'RunningOnClient'))
     end
     self
@@ -495,6 +504,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
@@ -565,12 +578,13 @@ class WhRunPipelineInstance
               debuglog "names: #{@instance[:name]} #{@template[:name]}", 0
               if (not @instance[:name].nil?) and (not @instance[:name].empty?)
                 pipeline_name = @instance[:name]
-              else
+              elsif @instance[:pipeline_template_uuid]
                 fetch_template(@instance[:pipeline_template_uuid])
                 pipeline_name = @template[:name]
+              else
+                pipeline_name = "pipeline started #{@instance[:started_at]}"
               end
               if c[:output_name] != false
-                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,
@@ -578,14 +592,33 @@ class WhRunPipelineInstance
                                                    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
+                  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
@@ -661,6 +694,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
@@ -724,6 +761,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)