projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17170: Merge branch 'master'
[arvados.git]
/
services
/
api
/
app
/
models
/
container.rb
diff --git
a/services/api/app/models/container.rb
b/services/api/app/models/container.rb
index 5833c2251f9b8db26a5ebf5834130d96fc4690d0..8feee77ff23553eaba0429125c1b06f3f5688d50 100644
(file)
--- a/
services/api/app/models/container.rb
+++ b/
services/api/app/models/container.rb
@@
-29,6
+29,7
@@
class Container < ArvadosModel
serialize :command, Array
serialize :scheduling_parameters, Hash
serialize :command, Array
serialize :scheduling_parameters, Hash
+ after_find :fill_container_defaults_after_find
before_validation :fill_field_defaults, :if => :new_record?
before_validation :set_timestamps
before_validation :check_lock
before_validation :fill_field_defaults, :if => :new_record?
before_validation :set_timestamps
before_validation :check_lock
@@
-76,6
+77,8
@@
class Container < ArvadosModel
t.add :runtime_user_uuid
t.add :runtime_auth_scopes
t.add :lock_count
t.add :runtime_user_uuid
t.add :runtime_auth_scopes
t.add :lock_count
+ t.add :gateway_address
+ t.add :interactive_session_started
end
# Supported states for a container
end
# Supported states for a container
@@
-101,11
+104,11
@@
class Container < ArvadosModel
end
def self.full_text_searchable_columns
end
def self.full_text_searchable_columns
- super - ["secret_mounts", "secret_mounts_md5", "runtime_token"]
+ super - ["secret_mounts", "secret_mounts_md5", "runtime_token"
, "gateway_address"
]
end
def self.searchable_columns *args
end
def self.searchable_columns *args
- super - ["secret_mounts_md5", "runtime_token"]
+ super - ["secret_mounts_md5", "runtime_token"
, "gateway_address"
]
end
def logged_attributes
end
def logged_attributes
@@
-207,17
+210,16
@@
class Container < ArvadosModel
# containers are suitable).
def self.resolve_runtime_constraints(runtime_constraints)
rc = {}
# containers are suitable).
def self.resolve_runtime_constraints(runtime_constraints)
rc = {}
- defaults = {
- 'keep_cache_ram' =>
- Rails.configuration.Containers.DefaultKeepCacheRAM,
- }
- defaults.merge(runtime_constraints).each do |k, v|
+ runtime_constraints.each do |k, v|
if v.is_a? Array
rc[k] = v[0]
else
rc[k] = v
end
end
if v.is_a? Array
rc[k] = v[0]
else
rc[k] = v
end
end
+ if rc['keep_cache_ram'] == 0
+ rc['keep_cache_ram'] = Rails.configuration.Containers.DefaultKeepCacheRAM
+ end
rc
end
rc
end
@@
-478,7
+480,10
@@
class Container < ArvadosModel
when Running
permitted.push :priority, *progress_attrs
if self.state_changed?
when Running
permitted.push :priority, *progress_attrs
if self.state_changed?
- permitted.push :started_at
+ permitted.push :started_at, :gateway_address
+ end
+ if !self.interactive_session_started_was
+ permitted.push :interactive_session_started
end
when Complete
end
when Complete