From: Peter Amstutz <peter.amstutz@curii.com>
Date: Tue, 25 Oct 2022 15:27:53 +0000 (-0400)
Subject: 18842: Add KeepCacheDisk to EstimateScratchSpace used by dispatchers
X-Git-Tag: 2.5.0~22^2~14
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c453e7667a87053ebc34d70c44995e116601cb93

18842: Add KeepCacheDisk to EstimateScratchSpace used by dispatchers

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/lib/dispatchcloud/node_size.go b/lib/dispatchcloud/node_size.go
index 7c7643bfc7..5b85d57ea6 100644
--- a/lib/dispatchcloud/node_size.go
+++ b/lib/dispatchcloud/node_size.go
@@ -56,7 +56,7 @@ func estimateDockerImageSize(collectionPDH string) int64 {
 // EstimateScratchSpace estimates how much available disk space (in
 // bytes) is needed to run the container by summing the capacity
 // requested by 'tmp' mounts plus disk space required to load the
-// Docker image.
+// Docker image plus arv-mount block cache.
 func EstimateScratchSpace(ctr *arvados.Container) (needScratch int64) {
 	for _, m := range ctr.Mounts {
 		if m.Kind == "tmp" {
@@ -80,6 +80,9 @@ func EstimateScratchSpace(ctr *arvados.Container) (needScratch int64) {
 	// Now reserve space for the extracted image on disk.
 	needScratch += dockerImageSize
 
+	// Now reserve space the arv-mount disk cache
+	needScratch += ctr.RuntimeConstraints.KeepCacheDisk
+
 	return
 }