[arvados] created: 2.6.0-28-gf96b8dba9

[git repository hosting]

        at  f96b8dba990aeb7c6b05f0dfab84be30a0d3b86c (commit)


commit f96b8dba990aeb7c6b05f0dfab84be30a0d3b86c
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 21 15:06:24 2023 -0400

    20378: Adjust trash_at of log collection to now+2 weeks
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index bfd852257..4a514f3d8 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1521,7 +1521,13 @@ func (runner *ContainerRunner) saveLogCollection(final bool) (response arvados.C
 	if final {
 		updates["is_trashed"] = true
 	} else {
-		exp := time.Now().Add(crunchLogUpdatePeriod * 24)
+		// We set trash_at so this collection gets
+		// automatically cleaned up eventually.  It used to be
+		// 12 hours but we had a situation where the API
+		// server was down over a weekend but the containers
+		// kept running such that the log collection got
+		// trashed, so now we make it 2 weeks.  refs #20378
+		exp := time.Now().Add(time.Duration(24*14) * time.Hour)
 		updates["trash_at"] = exp
 		updates["delete_at"] = exp
 	}

-----------------------------------------------------------------------


hooks/post-receive
--