X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e59b78c774872e33b9c69acc196989a0f565bdf4..8b873a9b3b8865a4d451263e48b49122b9c32759:/services/api/test/unit/container_request_test.rb diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb index 8ff216e28c..2637e77937 100644 --- a/services/api/test/unit/container_request_test.rb +++ b/services/api/test/unit/container_request_test.rb @@ -5,6 +5,7 @@ require 'test_helper' require 'helpers/container_test_helper' require 'helpers/docker_migration_helper' +require 'arvados/collection' class ContainerRequestTest < ActiveSupport::TestCase include DockerMigrationHelper @@ -245,18 +246,19 @@ class ContainerRequestTest < ActiveSupport::TestCase cr.reload assert_equal "Final", cr.state assert_equal users(:active).uuid, cr.modified_by_user_uuid - ['output', 'log'].each do |out_type| - pdh = Container.find_by_uuid(cr.container_uuid).send(out_type) - assert_equal(1, Collection.where(portable_data_hash: pdh, - owner_uuid: project.uuid).count, - "Container #{out_type} should be copied to #{project.uuid}") - end + assert_not_nil cr.output_uuid assert_not_nil cr.log_uuid output = Collection.find_by_uuid cr.output_uuid assert_equal output_pdh, output.portable_data_hash + assert_equal output.owner_uuid, project.uuid, "Container output should be copied to #{project.uuid}" + assert_not_nil output.modified_at + log = Collection.find_by_uuid cr.log_uuid - assert_equal log_pdh, log.portable_data_hash + assert_equal log.manifest_text, ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar +./log\\040for\\040container\\040#{cr.container_uuid} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + + assert_equal log.owner_uuid, project.uuid, "Container log should be copied to #{project.uuid}" end test "Container makes container request, then is cancelled" do @@ -441,6 +443,27 @@ class ContainerRequestTest < ActiveSupport::TestCase "path" => "/foo", } end], + [{"/out" => { + "kind" => "collection", + "portable_data_hash" => "1f4b0bc7583c2a7f9102c395f4ffc5e3+45", + "path" => "/foo"}}, + lambda do |resolved| + resolved["/out"] == { + "portable_data_hash" => "1f4b0bc7583c2a7f9102c395f4ffc5e3+45", + "kind" => "collection", + "path" => "/foo", + } + end], + # Empty collection + [{"/out" => { + "kind" => "collection", + "path" => "/foo"}}, + lambda do |resolved| + resolved["/out"] == { + "kind" => "collection", + "path" => "/foo", + } + end], ].each do |mounts, okfunc| test "resolve mounts #{mounts.inspect} to values" do set_user_from_auth :active @@ -474,9 +497,8 @@ class ContainerRequestTest < ActiveSupport::TestCase "path" => "/foo", }, } - assert_raises(ArgumentError) do - Container.resolve_mounts(m) - end + resolved_mounts = Container.resolve_mounts(m) + assert_equal m['portable_data_hash'], resolved_mounts['portable_data_hash'] end ['arvados/apitestfixture:latest', @@ -493,7 +515,7 @@ class ContainerRequestTest < ActiveSupport::TestCase test "Container.resolve_container_image(pdh)" do set_user_from_auth :active [[:docker_image, 'v1'], [:docker_image_1_12, 'v2']].each do |coll, ver| - Rails.configuration.docker_image_formats = [ver] + Rails.configuration.Containers.SupportedDockerImageFormats = {ver=>{}} pdh = collections(coll).portable_data_hash resolved = Container.resolve_container_image(pdh) assert_equal resolved, pdh @@ -512,8 +534,14 @@ class ContainerRequestTest < ActiveSupport::TestCase end end + test "allow unrecognized container when there are remote_hosts" do + set_user_from_auth :active + Rails.configuration.RemoteClusters = Rails.configuration.RemoteClusters.merge({foooo: ActiveSupport::InheritableOptions.new({Host: "bar.com"})}) + Container.resolve_container_image('acbd18db4cc2f85cedef654fccc4a4d8+3') + end + test "migrated docker image" do - Rails.configuration.docker_image_formats = ['v2'] + Rails.configuration.Containers.SupportedDockerImageFormats = {'v2'=>{}} add_docker19_migration_link # Test that it returns only v2 images even though request is for v1 image. @@ -531,7 +559,7 @@ class ContainerRequestTest < ActiveSupport::TestCase end test "use unmigrated docker image" do - Rails.configuration.docker_image_formats = ['v1'] + Rails.configuration.Containers.SupportedDockerImageFormats = {'v1'=>{}} add_docker19_migration_link # Test that it returns only supported v1 images even though there is a @@ -550,7 +578,7 @@ class ContainerRequestTest < ActiveSupport::TestCase end test "incompatible docker image v1" do - Rails.configuration.docker_image_formats = ['v1'] + Rails.configuration.Containers.SupportedDockerImageFormats = {'v1'=>{}} add_docker19_migration_link # Don't return unsupported v2 image even if we ask for it directly. @@ -563,7 +591,7 @@ class ContainerRequestTest < ActiveSupport::TestCase end test "incompatible docker image v2" do - Rails.configuration.docker_image_formats = ['v2'] + Rails.configuration.Containers.SupportedDockerImageFormats = {'v2'=>{}} # No migration link, don't return unsupported v1 image, set_user_from_auth :active @@ -717,6 +745,46 @@ class ContainerRequestTest < ActiveSupport::TestCase cr.reload assert_equal "Final", cr.state assert_equal prev_container_uuid, cr.container_uuid + end + + + test "Retry saves logs from previous attempts" do + set_user_from_auth :active + cr = create_minimal_req!(priority: 1, state: "Committed", container_count_max: 3) + + c = act_as_system_user do + c = Container.find_by_uuid(cr.container_uuid) + c.update_attributes!(state: Container::Locked) + c.update_attributes!(state: Container::Running) + c + end + + container_uuids = [] + + [0, 1, 2].each do + cr.reload + assert_equal "Committed", cr.state + container_uuids << cr.container_uuid + + c = act_as_system_user do + logc = Collection.new(manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n") + logc.save! + c = Container.find_by_uuid(cr.container_uuid) + c.update_attributes!(state: Container::Cancelled, log: logc.portable_data_hash) + c + end + end + + container_uuids.sort! + + cr.reload + assert_equal "Final", cr.state + assert_equal 3, cr.container_count + assert_equal ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar +./log\\040for\\040container\\040#{container_uuids[0]} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar +./log\\040for\\040container\\040#{container_uuids[1]} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar +./log\\040for\\040container\\040#{container_uuids[2]} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar +" , Collection.find_by_uuid(cr.log_uuid).manifest_text end @@ -769,7 +837,7 @@ class ContainerRequestTest < ActiveSupport::TestCase assert_not_nil(trash) assert_not_nil(delete) assert_in_delta(trash, now + 1.second, 10) - assert_in_delta(delete, now + Rails.configuration.blob_signature_ttl.second, 10) + assert_in_delta(delete, now + Rails.configuration.Collections.BlobSigningTTL, 10) end def check_output_ttl_1y(now, trash, delete) @@ -817,7 +885,7 @@ class ContainerRequestTest < ActiveSupport::TestCase [false, ActiveRecord::RecordInvalid], [true, nil], ].each do |preemptible_conf, expected| - test "having Rails.configuration.preemptible_instances=#{preemptible_conf}, create preemptible container request and verify #{expected}" do + test "having Rails.configuration.Containers.UsePreemptibleInstances=#{preemptible_conf}, create preemptible container request and verify #{expected}" do sp = {"preemptible" => true} common_attrs = {cwd: "test", priority: 1, @@ -825,7 +893,7 @@ class ContainerRequestTest < ActiveSupport::TestCase output_path: "test", scheduling_parameters: sp, mounts: {"test" => {"kind" => "json"}}} - Rails.configuration.preemptible_instances = preemptible_conf + Rails.configuration.Containers.UsePreemptibleInstances = preemptible_conf set_user_from_auth :active cr = create_minimal_req!(common_attrs) @@ -854,7 +922,7 @@ class ContainerRequestTest < ActiveSupport::TestCase scheduling_parameters: {"preemptible" => false}, mounts: {"test" => {"kind" => "json"}}} - Rails.configuration.preemptible_instances = true + Rails.configuration.Containers.UsePreemptibleInstances = true set_user_from_auth :active if requesting_c @@ -879,14 +947,14 @@ class ContainerRequestTest < ActiveSupport::TestCase [false, 'zzzzz-dz642-runningcontainr', nil], [false, nil, nil], ].each do |preemptible_conf, requesting_c, schedule_preemptible| - test "having Rails.configuration.preemptible_instances=#{preemptible_conf}, #{requesting_c.nil? ? 'non-':''}child CR should #{schedule_preemptible ? '':'not'} ask for preemptible instance by default" do + test "having Rails.configuration.Containers.UsePreemptibleInstances=#{preemptible_conf}, #{requesting_c.nil? ? 'non-':''}child CR should #{schedule_preemptible ? '':'not'} ask for preemptible instance by default" do common_attrs = {cwd: "test", priority: 1, command: ["echo", "hello"], output_path: "test", mounts: {"test" => {"kind" => "json"}}} - Rails.configuration.preemptible_instances = preemptible_conf + Rails.configuration.Containers.UsePreemptibleInstances = preemptible_conf set_user_from_auth :active if requesting_c @@ -950,7 +1018,7 @@ class ContainerRequestTest < ActiveSupport::TestCase state: ContainerRequest::Committed, mounts: {"test" => {"kind" => "json"}}} set_user_from_auth :active - Rails.configuration.preemptible_instances = true + Rails.configuration.Containers.UsePreemptibleInstances = true cr = with_container_auth(Container.find_by_uuid 'zzzzz-dz642-runningcontainr') do create_minimal_req!(common_attrs)