X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d73acc845a2dd7413fdde0742473d83bf3d0719..8c9b4a1c7b4ad3feb5c0ccb14888aad7ed262e18:/services/api/app/controllers/arvados/v1/jobs_controller.rb diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb index 178b48f173..6fddba7a56 100644 --- a/services/api/app/controllers/arvados/v1/jobs_controller.rb +++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb @@ -9,55 +9,98 @@ class Arvados::V1::JobsController < ApplicationController [:repository, :script, :script_version, :script_parameters].each do |r| if !resource_attrs[r] return render json: { - :error => "#{r} attribute must be specified" + :errors => ["#{r} attribute must be specified"] }, status: :unprocessable_entity end end + load_filters_param - r = Commit.find_commit_range(current_user, - resource_attrs[:repository], - resource_attrs[:minimum_script_version], - resource_attrs[:script_version], - resource_attrs[:exclude_script_versions]) - if !resource_attrs[:nondeterministic] and !resource_attrs[:no_reuse] - # Search for jobs where the script_version is in the list of commits - # returned by find_commit_range + # We used to ask for the minimum_, exclude_, and no_reuse params + # in the job resource. Now we advertise them as flags that alter + # the behavior of the create action. + [:minimum_script_version, :exclude_script_versions].each do |attr| + if resource_attrs.has_key? attr + params[attr] = resource_attrs.delete attr + end + end + if resource_attrs.has_key? :no_reuse + params[:find_or_create] = !resource_attrs.delete(:no_reuse) + end + + if params[:find_or_create] + # Convert old special-purpose creation parameters to the new + # filters-based method. + minimum_script_version = params[:minimum_script_version] + exclude_script_versions = params.fetch(:exclude_script_versions, []) + @filters.select do |(col_name, operand, operator)| + case col_name + when "script_version" + case operand + when "in range" + minimum_script_version = operator + false + when "not in", "not in range" + begin + exclude_script_versions += operator + rescue TypeError + exclude_script_versions << operator + end + false + else + true + end + else + true + end + end + @filters.append(["script_version", "in", + Commit.find_commit_range(current_user, + resource_attrs[:repository], + minimum_script_version, + resource_attrs[:script_version], + exclude_script_versions)]) + + # Set up default filters for specific parameters. + if @filters.select { |f| f.first == "script" }.empty? + @filters.append(["script", "=", resource_attrs[:script]]) + end + + @objects = Job.readable_by(current_user) + apply_filters @object = nil - Job.readable_by(current_user).where(script: resource_attrs[:script], - script_version: r). - each do |j| + incomplete_job = nil + @objects.each do |j| if j.nondeterministic != true and - j.success != false and + ((j.success == true and j.output != nil) or j.running == true) and j.script_parameters == resource_attrs[:script_parameters] - # Record the first job in the list - if !@object - @object = j - end - # Ensure that all candidate jobs actually did produce the same output - if @object.output != j.output - @object = nil - break + if j.running + # We'll use this if we don't find a job that has completed + incomplete_job ||= j + else + # Record the first job in the list + if !@object + @object = j + end + # Ensure that all candidate jobs actually did produce the same output + if @object.output != j.output + @object = nil + break + end end end + @object ||= incomplete_job if @object return show end end end - if r - resource_attrs[:script_version] = r[0] - end - # Don't pass these on to activerecord - resource_attrs.delete(:minimum_script_version) - resource_attrs.delete(:exclude_script_versions) - resource_attrs.delete(:no_reuse) super end def cancel reload_object_before_update - @object.update_attributes cancelled_at: Time.now + @object.update_attributes! cancelled_at: Time.now show end @@ -105,55 +148,12 @@ class Arvados::V1::JobsController < ApplicationController @job.reload end end - @redis = Redis.new(:timeout => 0) - if @redis.exists @job.uuid - # A log buffer exists. Start by showing the last few KB. - @redis. - getrange(@job.uuid, 0 - [@opts[:buffer_size], 1].max, -1). - sub(/^[^\n]*\n?/, ''). - split("\n"). - each do |line| - yield "#{line}\n" - end - end - # TODO: avoid missing log entries between getrange() above and - # subscribe() below. - @redis.subscribe(@job.uuid) do |event| - event.message do |channel, msg| - if msg == "end" - @redis.unsubscribe @job.uuid - else - yield "#{msg}\n" - end - end - end - end - end - - def self._log_tail_follow_requires_parameters - { - buffer_size: {type: 'integer', required: false, default: 2**13} - } - end - def log_tail_follow - if !@object.andand.uuid - return render_not_found - end - if client_accepts_plain_text_stream - self.response.headers['Last-Modified'] = Time.now.ctime.to_s - self.response_body = LogStreamer.new @object, { - buffer_size: (params[:buffer_size].to_i rescue 2**13) - } - else - render json: { - href: url_for(uuid: @object.uuid), - comment: ('To retrieve the log stream as plain text, ' + - 'use a request header like "Accept: text/plain"') - } end end def queue + params[:order] ||= ['priority desc', 'created_at'] + load_limit_offset_order_params load_where_param @where.merge!({ started_at: nil, @@ -161,7 +161,7 @@ class Arvados::V1::JobsController < ApplicationController cancelled_at: nil, success: nil }) - params[:order] ||= 'priority desc, created_at' + load_filters_param find_objects_for_index index end