Merge branch '8784-dir-listings'

[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..e8ab0cbf7117e0e25139cf403db566ca86d2e72f 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
@@ -73,6 +77,10 @@ class ContainerRequest < ArvadosModel
   :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
@@ -102,18 +110,12 @@ class ContainerRequest < ArvadosModel
       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
-          # 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
@@ -125,7 +127,7 @@ class ContainerRequest < ArvadosModel
                             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,