projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11626-crunch2-log-slurm-errors' closes #11626
[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 edd69d0b08fb00246126ffe58fad0fa000ee85bc..4387dfab3b9026daec8c82f48594be41f8fb38e9 100644
(file)
--- a/
services/api/app/models/container_request.rb
+++ b/
services/api/app/models/container_request.rb
@@
-73,6
+73,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
@@
-102,18
+106,12
@@
class ContainerRequest < ArvadosModel
next if pdh.nil?
coll_name = "Container #{out_type} for request #{uuid}"
trash_at = nil
next if pdh.nil?
coll_name = "Container #{out_type} for request #{uuid}"
trash_at = nil
- delete_at = nil
if out_type == 'output'
if self.output_name
coll_name = self.output_name
end
if self.output_ttl > 0
trash_at = db_current_time + self.output_ttl
if out_type == 'output'
if self.output_name
coll_name = self.output_name
end
if self.output_ttl > 0
trash_at = db_current_time + self.output_ttl
- # delete_at cannot be sooner than blob_signature_ttl, even
- # after the delay between now and the collection validation.
- delete_at = db_current_time +
- [self.output_ttl,
- Rails.configuration.blob_signature_ttl + 60].max
end
end
manifest = Collection.unscoped do
end
end
manifest = Collection.unscoped do
@@
-125,7
+123,7
@@
class ContainerRequest < ArvadosModel
portable_data_hash: pdh,
name: coll_name,
trash_at: trash_at,
portable_data_hash: pdh,
name: coll_name,
trash_at: trash_at,
- delete_at:
delete
_at,
+ delete_at:
trash
_at,
properties: {
'type' => out_type,
'container_request' => uuid,
properties: {
'type' => out_type,
'container_request' => uuid,