projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18842-arv-mount-disk-config' refs #18842
[arvados.git]
/
services
/
api
/
app
/
models
/
arvados_model.rb
diff --git
a/services/api/app/models/arvados_model.rb
b/services/api/app/models/arvados_model.rb
index a369292fb38c09a417b32bd3d33ea165319de647..1ff46c3616975f4d90e23b5ef4603facd1ccc217 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-950,6
+950,10
@@
class ArvadosModel < ApplicationRecord
# value in the database to an implicit zero/false value in an update
# request.
def fill_container_defaults
# value in the database to an implicit zero/false value in an update
# request.
def fill_container_defaults
+ # Make sure this is correctly sorted by key, because we merge in
+ # whatever is in the database on top of it, this will be the order
+ # that gets used downstream rather than the order the keys appear
+ # in the database.
self.runtime_constraints = {
'API' => false,
'cuda' => {
self.runtime_constraints = {
'API' => false,
'cuda' => {
@@
-957,6
+961,7
@@
class ArvadosModel < ApplicationRecord
'driver_version' => '',
'hardware_capability' => '',
},
'driver_version' => '',
'hardware_capability' => '',
},
+ 'keep_cache_disk' => 0,
'keep_cache_ram' => 0,
'ram' => 0,
'vcpus' => 0,
'keep_cache_ram' => 0,
'ram' => 0,
'vcpus' => 0,