X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ee91e2ebc7759e1823edd376db938a785ad62f45..ac3bafbcbc8e6d6c6b3be13e3e29b7ab7cf4ad7a:/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb diff --git a/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb b/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb index 01f2b9c51b..8007fd26f8 100644 --- a/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb +++ b/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb @@ -17,10 +17,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { - input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', - an_integer: '1' + an_integer: '1', + input: 'fa7aeb5140e2848d39b416daeef4ffc5+45' } } assert_response :success @@ -35,7 +35,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -55,7 +55,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "tag1", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -76,7 +76,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: true, script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -90,24 +90,26 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version'] end - test "do not reuse job because find_or_create=false" do - post :create, { - job: { - script: "hash", - script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", - script_parameters: { - input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', - an_integer: '1' - } - }, - find_or_create: false - } - assert_response :success - assert_not_nil assigns(:object) - new_job = JSON.parse(@response.body) - assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid'] - assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version'] + [false, "false"].each do |whichfalse| + test "do not reuse job because find_or_create=#{whichfalse.inspect}" do + post :create, { + job: { + script: "hash", + script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "active/foo", + script_parameters: { + input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', + an_integer: '1' + } + }, + find_or_create: whichfalse + } + assert_response :success + assert_not_nil assigns(:object) + new_job = JSON.parse(@response.body) + assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid'] + assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version'] + end end test "do not reuse job because output is not readable by user" do @@ -116,7 +118,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -136,7 +138,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '2' @@ -154,7 +156,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase script: "hash", minimum_script_version: "tag1", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -172,7 +174,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -190,7 +192,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '2' @@ -208,7 +210,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '2' @@ -226,7 +228,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -245,7 +247,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash2", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -264,7 +266,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase no_reuse: false, script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -283,7 +285,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase script: "hash", minimum_script_version: "31ce37fe365b3dc204300a3e4c396ad333ed0556", script_version: "master", - repository: "foo", + repository: "active/foo", exclude_script_versions: ["tag1"], script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', @@ -294,7 +296,8 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase assert_not_nil assigns(:object) new_job = JSON.parse(@response.body) assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid'] - assert_equal '077ba2ad3ea24a929091a9e6ce545c93199b8e57', new_job['script_version'] + assert_not_equal('4fe459abe02d9b365932b8f5dc419439ab4e2577', + new_job['script_version']) end test "cannot reuse job with find_or_create but excluded version" do @@ -302,7 +305,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -316,14 +319,21 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase assert_not_nil assigns(:object) new_job = JSON.parse(@response.body) assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid'] - assert_equal '077ba2ad3ea24a929091a9e6ce545c93199b8e57', new_job['script_version'] + assert_not_equal('4fe459abe02d9b365932b8f5dc419439ab4e2577', + new_job['script_version']) + end + + test "cannot reuse job when hash-like branch includes newer commit" do + check_new_job_created_from({job: {script_version: "738783"}}, + :previous_job_run_superseded_by_hash_branch) end BASE_FILTERS = { - 'repository' => ['=', 'foo'], + 'repository' => ['=', 'active/foo'], 'script' => ['=', 'hash'], 'script_version' => ['in git', 'master'], 'docker_image_locator' => ['=', nil], + 'arvados_sdk_version' => ['=', nil], } def filters_from_hash(hash) @@ -331,19 +341,19 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "can reuse a Job based on filters" do - filter_h = BASE_FILTERS. + filters_hash = BASE_FILTERS. merge('script_version' => ['in git', 'tag1']) post(:create, { job: { script: "hash", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' } }, - filters: filters_from_hash(filter_h), + filters: filters_from_hash(filters_hash), find_or_create: true, }) assert_response :success @@ -354,21 +364,22 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "can not reuse a Job based on filters" do - filter_a = filters_from_hash(BASE_FILTERS.reject { |k| k == 'script_version' }) - filter_a += [["script_version", "in git", - "31ce37fe365b3dc204300a3e4c396ad333ed0556"], - ["script_version", "not in git", ["tag1"]]] + filters = filters_from_hash(BASE_FILTERS + .reject { |k| k == 'script_version' }) + filters += [["script_version", "in git", + "31ce37fe365b3dc204300a3e4c396ad333ed0556"], + ["script_version", "not in git", ["tag1"]]] post(:create, { job: { script: "hash", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' } }, - filters: filter_a, + filters: filters, find_or_create: true, }) assert_response :success @@ -379,19 +390,19 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "can not reuse a Job based on arbitrary filters" do - filter_h = BASE_FILTERS. + filters_hash = BASE_FILTERS. merge("created_at" => ["<", "2010-01-01T00:00:00Z"]) post(:create, { job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' } }, - filters: filters_from_hash(filter_h), + filters: filters_from_hash(filters_hash), find_or_create: true, }) assert_response :success @@ -406,7 +417,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -427,7 +438,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "can reuse a Job with a Docker image hash filter" do - filter_h = BASE_FILTERS. + filters_hash = BASE_FILTERS. merge("script_version" => ["=", "4fe459abe02d9b365932b8f5dc419439ab4e2577"], "docker_image_locator" => @@ -436,13 +447,13 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' }, }, - filters: filters_from_hash(filter_h), + filters: filters_from_hash(filters_hash), find_or_create: true, }) assert_response :success @@ -455,7 +466,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "reuse Job with Docker image repo+tag" do - filter_h = BASE_FILTERS. + filters_hash = BASE_FILTERS. merge("script_version" => ["=", "4fe459abe02d9b365932b8f5dc419439ab4e2577"], "docker_image_locator" => @@ -464,13 +475,13 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' }, }, - filters: filters_from_hash(filter_h), + filters: filters_from_hash(filters_hash), find_or_create: true, }) assert_response :success @@ -483,19 +494,19 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "new job with unknown Docker image filter" do - filter_h = BASE_FILTERS. + filters_hash = BASE_FILTERS. merge("docker_image_locator" => ["in docker", "_nonesuchname_"]) post(:create, { job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' }, }, - filters: filters_from_hash(filter_h), + filters: filters_from_hash(filters_hash), find_or_create: true, }) assert_response :success @@ -504,20 +515,35 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase assert_not_equal(jobs(:previous_docker_job_run).uuid, new_job.uuid) end + test "don't reuse job using older Docker image of same name" do + jobspec = {runtime_constraints: { + docker_image: "arvados/apitestfixture", + }} + check_new_job_created_from({job: jobspec}, + :previous_ancient_docker_image_job_run) + end + + test "reuse job with Docker image that has hash name" do + jobspec = {runtime_constraints: { + docker_image: "a" * 64, + }} + check_job_reused_from(jobspec, :previous_docker_job_run) + end + ["repository", "script"].each do |skip_key| test "missing #{skip_key} filter raises an error" do - filter_a = filters_from_hash(BASE_FILTERS.reject { |k| k == skip_key }) + filters = filters_from_hash(BASE_FILTERS.reject { |k| k == skip_key }) post(:create, { job: { script: "hash", script_version: "master", - repository: "foo", + repository: "active/foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' } }, - filters: filter_a, + filters: filters, find_or_create: true, }) assert_includes(405..599, @response.code.to_i, @@ -526,7 +552,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "find Job with script version range" do - get :index, filters: [["repository", "=", "foo"], + get :index, filters: [["repository", "=", "active/foo"], ["script", "=", "hash"], ["script_version", "in git", "tag1"]] assert_response :success @@ -536,7 +562,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "find Job with script version range exclusions" do - get :index, filters: [["repository", "=", "foo"], + get :index, filters: [["repository", "=", "active/foo"], ["script", "=", "hash"], ["script_version", "not in git", "tag1"]] assert_response :success @@ -593,47 +619,64 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase jobs(:previous_docker_job_run).uuid) end - def create_foo_hash_job_params(params) + JOB_SUBMIT_KEYS = [:script, :script_parameters, :script_version, :repository] + DEFAULT_START_JOB = :previous_job_run + + def create_job_params(params, start_from=DEFAULT_START_JOB) if not params.has_key?(:find_or_create) params[:find_or_create] = true end job_attrs = params.delete(:job) || {} - params[:job] = { - script: "hash", - script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", - repository: "foo", - script_parameters: { - input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', - an_integer: '1', - }, - }.merge(job_attrs) + start_job = jobs(start_from) + params[:job] = Hash[JOB_SUBMIT_KEYS.map do |key| + [key, start_job.send(key)] + end] + params[:job][:runtime_constraints] = + job_attrs.delete(:runtime_constraints) || {} + { arvados_sdk_version: :arvados_sdk_version, + docker_image_locator: :docker_image }.each do |method, constraint_key| + if constraint_value = start_job.send(method) + params[:job][:runtime_constraints][constraint_key] ||= constraint_value + end + end + params[:job].merge!(job_attrs) params end - def check_new_job_created_from(params) - start_time = Time.now - post(:create, create_foo_hash_job_params(params)) + def create_job_from(params, start_from) + post(:create, create_job_params(params, start_from)) assert_response :success new_job = assigns(:object) assert_not_nil new_job + new_job + end + + def check_new_job_created_from(params, start_from=DEFAULT_START_JOB) + start_time = Time.now + new_job = create_job_from(params, start_from) assert_operator(start_time, :<=, new_job.created_at) new_job end - def check_errors_from(params) - post(:create, create_foo_hash_job_params(params)) + def check_job_reused_from(params, start_from) + new_job = create_job_from(params, start_from) + assert_equal(jobs(start_from).uuid, new_job.uuid) + end + + def check_errors_from(params, start_from=DEFAULT_START_JOB) + post(:create, create_job_params(params, start_from)) assert_includes(405..499, @response.code.to_i) errors = json_response.fetch("errors", []) assert(errors.any?, "no errors assigned from #{params}") refute(errors.any? { |msg| msg =~ /^#<[A-Za-z]+: / }, - "errors include raw exception") + "errors include raw exception: #{errors.inspect}") errors end # 1de84a8 is on the b1 branch, after master's tip. test "new job created from unsatisfiable minimum version filter" do - filter_h = BASE_FILTERS.merge("script_version" => ["in git", "1de84a8"]) - check_new_job_created_from(filters: filters_from_hash(filter_h)) + filters_hash = BASE_FILTERS.merge("script_version" => ["in git", "1de84a8"]) + check_new_job_created_from(filters: filters_from_hash(filters_hash)) end test "new job created from unsatisfiable minimum version parameter" do @@ -645,9 +688,9 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase end test "graceful error from nonexistent minimum version filter" do - filter_h = BASE_FILTERS.merge("script_version" => - ["in git", "__nosuchbranch__"]) - errors = check_errors_from(filters: filters_from_hash(filter_h)) + filters_hash = BASE_FILTERS.merge("script_version" => + ["in git", "__nosuchbranch__"]) + errors = check_errors_from(filters: filters_from_hash(filters_hash)) assert(errors.any? { |msg| msg.include? "__nosuchbranch__" }, "bad refspec not mentioned in error message") end @@ -663,4 +706,49 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase assert(errors.any? { |msg| msg.include? "__nosuchbranch__" }, "bad refspec not mentioned in error message") end + + test "don't reuse job with older Arvados SDK version specified by branch" do + jobspec = {runtime_constraints: { + arvados_sdk_version: "master", + }} + check_new_job_created_from({job: jobspec}, + :previous_job_run_with_arvados_sdk_version) + end + + test "don't reuse job with older Arvados SDK version specified by commit" do + jobspec = {runtime_constraints: { + arvados_sdk_version: "ca68b24e51992e790f29df5cc4bc54ce1da4a1c2", + }} + check_new_job_created_from({job: jobspec}, + :previous_job_run_with_arvados_sdk_version) + end + + test "don't reuse job with newer Arvados SDK version specified by commit" do + jobspec = {runtime_constraints: { + arvados_sdk_version: "436637c87a1d2bdbf4b624008304064b6cf0e30c", + }} + check_new_job_created_from({job: jobspec}, + :previous_job_run_with_arvados_sdk_version) + end + + test "reuse job from arvados_sdk_version git filters" do + prev_job = jobs(:previous_job_run_with_arvados_sdk_version) + filters_hash = BASE_FILTERS. + merge("arvados_sdk_version" => ["in git", "commit2"], + "docker_image_locator" => ["=", prev_job.docker_image_locator]) + filters_hash.delete("script_version") + params = create_job_params(filters: filters_from_hash(filters_hash)) + post(:create, params) + assert_response :success + assert_equal(prev_job.uuid, assigns(:object).uuid) + end + + test "create new job because of arvados_sdk_version 'not in git' filters" do + filters_hash = BASE_FILTERS.reject { |k| k == "script_version" } + filters = filters_from_hash(filters_hash) + # Allow anything from the root commit, but before commit 2. + filters += [["arvados_sdk_version", "in git", "436637c8"], + ["arvados_sdk_version", "not in git", "00634b2b"]] + check_new_job_created_from(filters: filters) + end end