X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/78b4e097593088a9c3614bf922a13e7eb454ea06..f69d2824c997c53caa11d30ba816768bad52e12b:/apps/workbench/app/helpers/pipeline_instances_helper.rb
diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index b282723c88..ba05f9e88c 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -18,16 +18,81 @@ module PipelineInstancesHelper
def render_pipeline_job pj
pj[:progress_bar] = render partial: 'job_progress', locals: {:j => pj[:job]}
pj[:output_link] = link_to_if_arvados_object pj[:output]
- pj[:job_link] = link_to_if_arvados_object pj[:job][:uuid]
+ pj[:job_link] = link_to_if_arvados_object pj[:job][:uuid] if pj[:job]
pj
end
+ # Merge (started_at, finished_at) time range into the list of time ranges in
+ # timestamps (timestamps must be sorted and non-overlapping).
+ # return the updated timestamps list.
+ def merge_range timestamps, started_at, finished_at
+ # in the comments below, 'i' is the entry in the timestamps array and 'j'
+ # is the started_at, finished_at range which is passed in.
+ timestamps.each_index do |i|
+ if started_at
+ if started_at >= timestamps[i][0] and finished_at <= timestamps[i][1]
+ # 'j' started and ended during 'i'
+ return timestamps
+ end
+
+ if started_at < timestamps[i][0] and finished_at >= timestamps[i][0] and finished_at <= timestamps[i][1]
+ # 'j' started before 'i' and finished during 'i'
+ # re-merge range between when 'j' started and 'i' finished
+ finished_at = timestamps[i][1]
+ timestamps.delete_at i
+ return merge_range timestamps, started_at, finished_at
+ end
+
+ if started_at >= timestamps[i][0] and started_at <= timestamps[i][1]
+ # 'j' started during 'i' and finished sometime after
+ # move end time of 'i' back
+ # re-merge range between when 'i' started and 'j' finished
+ started_at = timestamps[i][0]
+ timestamps.delete_at i
+ return merge_range timestamps, started_at, finished_at
+ end
+
+ if finished_at < timestamps[i][0]
+ # 'j' finished before 'i' started, so insert before 'i'
+ timestamps.insert i, [started_at, finished_at]
+ return timestamps
+ end
+ end
+ end
+
+ timestamps << [started_at, finished_at]
+ end
+
+ # Accept a list of objects with [:started_at] and [:finshed_at] keys and
+ # merge overlapping ranges to compute the time spent running after periods of
+ # overlapping execution are factored out.
+ def determine_wallclock_runtime jobs
+ timestamps = []
+ jobs.each do |j|
+ insert_at = 0
+ started_at = j[:started_at]
+ finished_at = (if j[:finished_at] then j[:finished_at] else Time.now end)
+ if started_at
+ timestamps = merge_range timestamps, started_at, finished_at
+ end
+ end
+ timestamps.map { |t| t[1] - t[0] }.reduce(:+) || 0
+ end
+
protected
def pipeline_jobs_newschool object
ret = []
i = -1
+ jobuuids = object.components.values.map { |c|
+ c[:job][:uuid] if c.is_a?(Hash) and c[:job].is_a?(Hash)
+ }.compact
+ job = {}
+ Job.where(uuid: jobuuids).each do |j|
+ job[j[:uuid]] = j
+ end
+
object.components.each do |cname, c|
i += 1
pj = {index: i, name: cname}
@@ -35,7 +100,31 @@ module PipelineInstancesHelper
ret << pj
next
end
- pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+ if c[:job] and c[:job][:uuid] and job[c[:job][:uuid]]
+ pj[:job] = job[c[:job][:uuid]]
+ elsif c[:job].is_a?(Hash)
+ pj[:job] = c[:job]
+ if pj[:job][:started_at].is_a? String
+ pj[:job][:started_at] = Time.parse(pj[:job][:started_at])
+ end
+ if pj[:job][:finished_at].is_a? String
+ pj[:job][:finished_at] = Time.parse(pj[:job][:finished_at])
+ end
+ # If necessary, figure out the state based on the other fields.
+ pj[:job][:state] ||= if pj[:job][:cancelled_at]
+ "Cancelled"
+ elsif pj[:job][:success] == false
+ "Failed"
+ elsif pj[:job][:success] == true
+ "Complete"
+ elsif pj[:job][:running] == true
+ "Running"
+ else
+ "Queued"
+ end
+ else
+ pj[:job] = {}
+ end
pj[:percent_done] = 0
pj[:percent_running] = 0
if pj[:job][:success]
@@ -63,31 +152,41 @@ module PipelineInstancesHelper
pj[:progress] = 0.0
end
end
- if pj[:job][:success]
+
+ case pj[:job][:state]
+ when 'Complete'
pj[:result] = 'complete'
pj[:labeltype] = 'success'
pj[:complete] = true
pj[:progress] = 1.0
- elsif pj[:job][:finished_at]
+ when 'Failed'
pj[:result] = 'failed'
pj[:labeltype] = 'danger'
pj[:failed] = true
- elsif pj[:job][:started_at]
+ when 'Cancelled'
+ pj[:result] = 'cancelled'
+ pj[:labeltype] = 'danger'
+ pj[:failed] = true
+ when 'Running'
pj[:result] = 'running'
pj[:labeltype] = 'primary'
- elsif pj[:job][:uuid]
+ when 'Queued'
pj[:result] = 'queued'
pj[:labeltype] = 'default'
else
pj[:result] = 'none'
pj[:labeltype] = 'default'
end
+
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]
+ pj[:repository] = pj[:job][:script] || c[:repository]
pj[:script_parameters] = pj[:job][:script_parameters] || c[:script_parameters]
pj[:script_version] = pj[:job][:script_version] || c[:script_version]
+ pj[:nondeterministic] = pj[:job][:nondeterministic] || c[:nondeterministic]
pj[:output] = pj[:job][:output]
- pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)
+ pj[:output_uuid] = c[:output_uuid]
+ pj[:finished_at] = pj[:job][:finished_at]
ret << pj
end
ret
@@ -140,4 +239,78 @@ module PipelineInstancesHelper
end
ret
end
+
+ MINUTE = 60
+ HOUR = 60 * MINUTE
+ DAY = 24 * HOUR
+
+ def render_runtime duration, use_words, round_to_min=true
+ days = 0
+ hours = 0
+ minutes = 0
+ seconds = 0
+
+ if duration >= DAY
+ days = (duration / DAY).floor
+ duration -= days * DAY
+ end
+
+ if duration >= HOUR
+ hours = (duration / HOUR).floor
+ duration -= hours * HOUR
+ end
+
+ if duration >= MINUTE
+ minutes = (duration / MINUTE).floor
+ duration -= minutes * MINUTE
+ end
+
+ seconds = duration.floor
+
+ if round_to_min and seconds >= 30
+ minutes += 1
+ end
+
+ if use_words
+ s = []
+ if days > 0 then
+ s << "#{days} day#{'s' if days != 1}"
+ end
+ if hours > 0 then
+ s << "#{hours} hour#{'s' if hours != 1}"
+ end
+ if minutes > 0 then
+ s << "#{minutes} minute#{'s' if minutes != 1}"
+ end
+ if not round_to_min or s.size == 0
+ s << "#{seconds} second#{'s' if seconds != 1}"
+ end
+ s = s * " "
+ else
+ s = ""
+ if days > 0
+ s += "#{days}d "
+ end
+
+ if (hours > 0)
+ s += "#{hours}h"
+ end
+
+ s += "#{minutes}m"
+
+ if not round_to_min
+ s += "#{seconds}s"
+ end
+ end
+
+ raw(s)
+ end
+
+ def render_unreadable_inputs_present
+ if current_user and controller.class.name.eql?('PipelineInstancesController') and unreadable_inputs_present?
+ raw('')
+ end
+ end
end