projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11453: Merge branch 'master' into 11453-federated-tokens
[arvados.git]
/
services
/
api
/
app
/
models
/
container_request.rb
diff --git
a/services/api/app/models/container_request.rb
b/services/api/app/models/container_request.rb
index 628ef886be99f06cdad61e95de4719ef0201b1ee..94e4e1f9ddd4289bc8bbe23c0f61d54d06213a18 100644
(file)
--- a/
services/api/app/models/container_request.rb
+++ b/
services/api/app/models/container_request.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'whitelist_update'
class ContainerRequest < ArvadosModel
require 'whitelist_update'
class ContainerRequest < ArvadosModel
@@
-24,6
+28,7
@@
class ContainerRequest < ArvadosModel
after_save :update_priority
after_save :finalize_if_needed
before_create :set_requesting_container_uuid
after_save :update_priority
after_save :finalize_if_needed
before_create :set_requesting_container_uuid
+ before_destroy :set_priority_zero
api_accessible :user, extend: :common do |t|
t.add :command
api_accessible :user, extend: :common do |t|
t.add :command
@@
-73,6
+78,10
@@
class ContainerRequest < ArvadosModel
:runtime_constraints, :state, :container_uuid, :use_existing,
:scheduling_parameters, :output_name, :output_ttl]
:runtime_constraints, :state, :container_uuid, :use_existing,
:scheduling_parameters, :output_name, :output_ttl]
+ def self.limit_index_columns_read
+ ["mounts"]
+ end
+
def state_transitions
State_transitions
end
def state_transitions
State_transitions
end
@@
-254,6
+263,10
@@
class ContainerRequest < ArvadosModel
end
end
end
end
+ def set_priority_zero
+ self.update_attributes!(priority: 0) if self.state != Final
+ end
+
def set_requesting_container_uuid
return !new_record? if self.requesting_container_uuid # already set
def set_requesting_container_uuid
return !new_record? if self.requesting_container_uuid # already set