From 95daf0ba05cf847f2f9ba493954cb73290a2d3c6 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Thu, 10 Jul 2025 10:54:47 -0600 Subject: [PATCH] Fix ulimit setting (#19087) * Fix setting both hard and soft limits * Clarify warning --- docker/main/rootfs/usr/local/ulimit/set_ulimit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/main/rootfs/usr/local/ulimit/set_ulimit.sh b/docker/main/rootfs/usr/local/ulimit/set_ulimit.sh index 6c1bacfa2..e5d1800a0 100755 --- a/docker/main/rootfs/usr/local/ulimit/set_ulimit.sh +++ b/docker/main/rootfs/usr/local/ulimit/set_ulimit.sh @@ -14,14 +14,14 @@ TARGET_HARD_LIMIT=65536 if [ "$current_soft_limit" -lt "$TARGET_SOFT_LIMIT" ]; then # Attempt to set both soft and hard limits to the new value # This requires sufficient privileges (e.g., running as root in the container) - if ulimit -n "$TARGET_SOFT_LIMIT:$TARGET_HARD_LIMIT"; then + if ulimit -Hn "$TARGET_HARD" && ulimit -Sn "$TARGET_SOFT"; then new_soft_limit=$(ulimit -Sn) new_hard_limit=$(ulimit -Hn) if [ "$new_soft_limit" -ne "$TARGET_SOFT_LIMIT" ] || [ "$new_hard_limit" -ne "$TARGET_HARD_LIMIT" ]; then - echo "Warning: Limits were set, but not to the exact target values. Check system constraints." + echo "Warning: Nofile limits were set, but not to the exact target values." fi else - echo "Error: Failed to set new nofile limits." + echo "Warning: Failed to set new nofile limits." fi fi \ No newline at end of file