diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 2e39e0e094..61f887891e 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -7641d36277ffa75d816ed79d9b23eeae4f17f3a5 \ No newline at end of file +8e61cafa4ee95c60eb55e5ebeb07d7b1c2947eae \ No newline at end of file diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs index 350205082b..872c357e26 100644 --- a/backend/windmill-common/src/worker.rs +++ b/backend/windmill-common/src/worker.rs @@ -186,9 +186,9 @@ pub fn get_vcpus() -> Option { } pub fn get_memory() -> Option { - if Path::new("/sys/fs/cgroup/memory/memory.max").exists() { + if Path::new("/sys/fs/cgroup/memory/memory.limit_in_bytes").exists() { // cgroup v1 - parse_file("/sys/fs/cgroup/memory/memory.max") + parse_file("/sys/fs/cgroup/memory/memory.limit_in_bytes") } else { // cgroup v2 let cgroup_path = get_cgroupv2_path()?;