X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa..9d413ff4e3868761422f79b4f81177cec05cbae5:/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 b36ff06bbd..81b49ff4fc 100644 --- a/services/api/test/unit/container_request_test.rb +++ b/services/api/test/unit/container_request_test.rb @@ -69,7 +69,7 @@ class ContainerRequestTest < ActiveSupport::TestCase cr.container_image = "img3" cr.cwd = "/tmp3" cr.environment = {"BUP" => "BOP"} - cr.mounts = {"BAR" => "BAZ"} + cr.mounts = {"BAR" => {"kind" => "BAZ"}} cr.output_path = "/tmp4" cr.priority = 2 cr.runtime_constraints = {"vcpus" => 4} @@ -81,29 +81,33 @@ class ContainerRequestTest < ActiveSupport::TestCase end [ - {"vcpus" => 1}, - {"vcpus" => 1, "ram" => nil}, - {"vcpus" => 0, "ram" => 123}, - {"vcpus" => "1", "ram" => "123"} - ].each do |invalid_constraints| - test "Create with #{invalid_constraints}" do + {"runtime_constraints" => {"vcpus" => 1}}, + {"runtime_constraints" => {"vcpus" => 1, "ram" => nil}}, + {"runtime_constraints" => {"vcpus" => 0, "ram" => 123}}, + {"runtime_constraints" => {"vcpus" => "1", "ram" => "123"}}, + {"mounts" => {"FOO" => "BAR"}}, + {"mounts" => {"FOO" => {}}}, + {"mounts" => {"FOO" => {"kind" => "tmp", "capacity" => 42.222}}}, + {"command" => ["echo", 55]}, + {"environment" => {"FOO" => 55}} + ].each do |value| + test "Create with invalid #{value}" do set_user_from_auth :active assert_raises(ActiveRecord::RecordInvalid) do - cr = create_minimal_req!(state: "Committed", - priority: 1, - runtime_constraints: invalid_constraints) + cr = create_minimal_req!({state: "Committed", + priority: 1}.merge(value)) cr.save! end end - test "Update with #{invalid_constraints}" do + test "Update with invalid #{value}" do set_user_from_auth :active cr = create_minimal_req!(state: "Uncommitted", priority: 1) cr.save! assert_raises(ActiveRecord::RecordInvalid) do cr = ContainerRequest.find_by_uuid cr.uuid - cr.update_attributes!(state: "Committed", - runtime_constraints: invalid_constraints) + cr.update_attributes!({state: "Committed", + priority: 1}.merge(value)) end end end @@ -375,7 +379,7 @@ class ContainerRequestTest < ActiveSupport::TestCase end [ - ['running_container_auth', 'zzzzz-dz642-runningcontainr', 1], + ['running_container_auth', 'zzzzz-dz642-runningcontainr', 501], ['active_no_prefs', nil, 0], ].each do |token, expected, expected_priority| test "create as #{token} and expect requesting_container_uuid to be #{expected}" do @@ -760,16 +764,16 @@ class ContainerRequestTest < ActiveSupport::TestCase [ [false, ActiveRecord::RecordInvalid], [true, nil], - ].each do |preemptable_conf, expected| - test "having Rails.configuration.preemptable_instances=#{preemptable_conf}, create preemptable container request and verify #{expected}" do - sp = {"preemptable" => true} + ].each do |preemptible_conf, expected| + test "having Rails.configuration.preemptible_instances=#{preemptible_conf}, create preemptible container request and verify #{expected}" do + sp = {"preemptible" => true} common_attrs = {cwd: "test", priority: 1, command: ["echo", "hello"], output_path: "test", scheduling_parameters: sp, mounts: {"test" => {"kind" => "json"}}} - Rails.configuration.preemptable_instances = preemptable_conf + Rails.configuration.preemptible_instances = preemptible_conf set_user_from_auth :active cr = create_minimal_req!(common_attrs) @@ -790,15 +794,15 @@ class ContainerRequestTest < ActiveSupport::TestCase 'zzzzz-dz642-runningcontainr', nil, ].each do |requesting_c| - test "having preemptable instances active on the API server, a committed #{requesting_c.nil? ? 'non-':''}child CR should not ask for preemptable instance if parameter already set to false" do + test "having preemptible instances active on the API server, a committed #{requesting_c.nil? ? 'non-':''}child CR should not ask for preemptible instance if parameter already set to false" do common_attrs = {cwd: "test", priority: 1, command: ["echo", "hello"], output_path: "test", - scheduling_parameters: {"preemptable" => false}, + scheduling_parameters: {"preemptible" => false}, mounts: {"test" => {"kind" => "json"}}} - Rails.configuration.preemptable_instances = true + Rails.configuration.preemptible_instances = true set_user_from_auth :active if requesting_c @@ -813,7 +817,7 @@ class ContainerRequestTest < ActiveSupport::TestCase cr.state = ContainerRequest::Committed cr.save! - assert_equal false, cr.scheduling_parameters['preemptable'] + assert_equal false, cr.scheduling_parameters['preemptible'] end end @@ -822,15 +826,15 @@ class ContainerRequestTest < ActiveSupport::TestCase [true, nil, nil], [false, 'zzzzz-dz642-runningcontainr', nil], [false, nil, nil], - ].each do |preemptable_conf, requesting_c, schedule_preemptable| - test "having Rails.configuration.preemptable_instances=#{preemptable_conf}, #{requesting_c.nil? ? 'non-':''}child CR should #{schedule_preemptable ? '':'not'} ask for preemptable instance by default" do + ].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 common_attrs = {cwd: "test", priority: 1, command: ["echo", "hello"], output_path: "test", mounts: {"test" => {"kind" => "json"}}} - Rails.configuration.preemptable_instances = preemptable_conf + Rails.configuration.preemptible_instances = preemptible_conf set_user_from_auth :active if requesting_c @@ -845,7 +849,7 @@ class ContainerRequestTest < ActiveSupport::TestCase cr.state = ContainerRequest::Committed cr.save! - assert_equal schedule_preemptable, cr.scheduling_parameters['preemptable'] + assert_equal schedule_preemptible, cr.scheduling_parameters['preemptible'] end end @@ -855,6 +859,11 @@ class ContainerRequestTest < ActiveSupport::TestCase [{"partitions" => "fastcpu"}, ContainerRequest::Committed, ActiveRecord::RecordInvalid], [{"partitions" => "fastcpu"}, ContainerRequest::Uncommitted], [{"partitions" => ["fastcpu","vfastcpu"]}, ContainerRequest::Committed], + [{"max_run_time" => "one day"}, ContainerRequest::Committed, ActiveRecord::RecordInvalid], + [{"max_run_time" => "one day"}, ContainerRequest::Uncommitted], + [{"max_run_time" => -1}, ContainerRequest::Committed, ActiveRecord::RecordInvalid], + [{"max_run_time" => -1}, ContainerRequest::Uncommitted], + [{"max_run_time" => 86400}, ContainerRequest::Committed], ].each do |sp, state, expected| test "create container request with scheduling_parameters #{sp} in state #{state} and verify #{expected}" do common_attrs = {cwd: "test", @@ -881,6 +890,26 @@ class ContainerRequestTest < ActiveSupport::TestCase end end + test "Having preemptible_instances=true create a committed child container request and verify the scheduling parameter of its container" do + common_attrs = {cwd: "test", + priority: 1, + command: ["echo", "hello"], + output_path: "test", + state: ContainerRequest::Committed, + mounts: {"test" => {"kind" => "json"}}} + set_user_from_auth :active + Rails.configuration.preemptible_instances = true + + cr = with_container_auth(Container.find_by_uuid 'zzzzz-dz642-runningcontainr') do + create_minimal_req!(common_attrs) + end + assert_equal 'zzzzz-dz642-runningcontainr', cr.requesting_container_uuid + assert_equal true, cr.scheduling_parameters["preemptible"] + + c = Container.find_by_uuid(cr.container_uuid) + assert_equal true, c.scheduling_parameters["preemptible"] + end + [['Committed', true, {name: "foobar", priority: 123}], ['Committed', false, {container_count: 2}], ['Committed', false, {container_count: 0}],