[arvados] updated: 2.6.0-69-g2dfb14b16

[git repository hosting]

Summary of changes:
 lib/config/config.default.yml | 11 ++++++-----
 lib/crunchrun/crunchrun.go    |  8 +++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

       via  2dfb14b167af543507669464213ccd78c0035075 (commit)
       via  38cef84287476d7c7757eea76898658b31c8f442 (commit)
      from  0c4281b181109d0129f85fa15aa62efb5ad65215 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2dfb14b167af543507669464213ccd78c0035075
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Apr 21 15:19:29 2023 -0400

    Adjust default value of BalanceCollectionBuffers down to 4
    
    Buffering a large number of collections in RAM is much less helpful
    since keep-balance started accessing the database directly instead of
    using the API.
    
    refs #20421
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index af8841265..cf9406b2b 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -543,11 +543,12 @@ Clusters:
       BalanceCollectionBatch: 0
 
       # The size of keep-balance's internal queue of
-      # collections. Higher values use more memory and improve throughput
-      # by allowing keep-balance to fetch the next page of collections
-      # while the current page is still being processed. If this is zero
-      # or omitted, pages are processed serially.
-      BalanceCollectionBuffers: 1000
+      # collections. Higher values may improve throughput by allowing
+      # keep-balance to fetch collections from the database while the
+      # current collection are still being processed, at the expense of
+      # using more memory.  If this is zero or omitted, pages are
+      # processed serially.
+      BalanceCollectionBuffers: 4
 
       # Maximum time for a rebalancing run. This ensures keep-balance
       # eventually gives up and retries if, for example, a network

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

    Adjust trash_at of log collection to now+2 weeks refs #20378
    
    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
--