X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bd86112ffba029e0f2c29c7d12ae6192e4097e18..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 7ce1fa9514..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,9 +578,11 @@ 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 # Create a collection located in the same project as the pipeline with the contents of the output. @@ -598,7 +613,7 @@ class WhRunPipelineInstance owner_uuid: owner_uuid, name: name, portable_data_hash: collections.first[:portable_data_hash], - manifest_text: collections.first[:manifest_text] + manifest_text: collections.first[:manifest_text] } debuglog "Creating collection #{newcollection}", 0 newcollection_actual = $arv.collection.create collection: newcollection, ensure_unique_name: true @@ -679,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 @@ -742,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)