[ARVADOS] updated: 1.1.1-118-g0b1508d

Git user git at public.curoverse.com
Fri Dec 1 16:31:05 EST 2017


Summary of changes:
 services/api/app/models/container.rb             | 2 +-
 services/api/app/models/container_request.rb     | 2 +-
 services/api/test/unit/container_request_test.rb | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

       via  0b1508df7ee4526340e8834422dd49ced63ee8d9 (commit)
      from  10993634c308dc62dd5e60f7d8d8ebf0391dd050 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0b1508df7ee4526340e8834422dd49ced63ee8d9
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Dec 1 16:30:41 2017 -0500

    12573: Priority for container/container request defaults to 0 instead of nil.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 98e5233..b3739da 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -334,7 +334,7 @@ class Container < ArvadosModel
     self.runtime_constraints ||= {}
     self.mounts ||= {}
     self.cwd ||= "."
-    self.priority ||= 1
+    self.priority ||= 0
     self.scheduling_parameters ||= {}
   end
 
diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index 68885d7..25becb2 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -159,7 +159,7 @@ class ContainerRequest < ArvadosModel
     self.container_count_max ||= Rails.configuration.container_count_max
     self.scheduling_parameters ||= {}
     self.output_ttl ||= 0
-    self.priority ||= 500
+    self.priority ||= 0
   end
 
   def set_container
diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index 8a1b7d3..e4c15ef 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -41,7 +41,7 @@ class ContainerRequestTest < ActiveSupport::TestCase
     cr = create_minimal_req!
 
     assert_nil cr.container_uuid
-    assert_equal 500, cr.priority
+    assert_equal 0, cr.priority
 
     check_bogus_states cr
 
@@ -324,8 +324,8 @@ class ContainerRequestTest < ActiveSupport::TestCase
   end
 
   [
-    ['running_container_auth', 'zzzzz-dz642-runningcontainr', containers(:running).priority],
-    ['active_no_prefs', nil, 500],
+    ['running_container_auth', 'zzzzz-dz642-runningcontainr', 12],
+    ['active_no_prefs', nil, 0],
   ].each do |token, expected, expected_priority|
     test "create as #{token} and expect requesting_container_uuid to be #{expected}" do
       set_user_from_auth token

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list