Skip to content

Commit dfab854

Browse files
committed
CORE-2035: pass disk usage requests to downstream services
1 parent 2d04bce commit dfab854

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

src/apps/service/apps/de/jobs/common.clj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
:min_memory_limit (resources/get-required-memory container requirements)
6161
:memory_limit (resources/get-max-memory container requirements)
6262
:min_cpu_cores (resources/get-required-cpus container requirements)
63-
:max_cpu_cores (resources/get-max-cpus container requirements))
63+
:max_cpu_cores (resources/get-max-cpus container requirements)
64+
:min_disk_space (resources/get-required-disk-space container requirements))
6465
remove-nil-vals))
6566

6667
(defn- add-container-info

src/apps/service/apps/de/jobs/resources.clj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@
5454
"Determines the maximum amount of CPUs that may be used by the app."
5555
[container requirements]
5656
(get-max-resource-setting :max_cpu_cores (config/default-cpu-limit) get-required-cpus container requirements))
57+
58+
(defn get-required-disk-space
59+
"Determines the minimum amount of disk space required for the container."
60+
[container requirements]
61+
(get-min-resource-setting :min_disk_space :min_disk_space (config/default-disk-limit) container requirements))

src/apps/util/config.clj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@
133133
[props config-valid configs]
134134
"apps.tools.default.memory-limit" (* 16 1024 1024 1024)) ;; 16GB
135135

136+
(cc/defprop-optint default-disk-limit
137+
"The disk usage limit, in bytes, to be used as the default resource limit when one is not set in a tool definition."
138+
[props config-valid configs]
139+
"apps.tools.default-disk-limit" (* 32 1024 1024 1024)) ;; 32GB
140+
136141
(cc/defprop-optstr workspace-root-app-category
137142
"The name of the root app category in a user's workspace."
138143
[props config-valid configs]

0 commit comments

Comments
 (0)