diff options
author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-10-24 09:06:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-24 09:06:31 +0200 |
commit | 1afef7d4676c17d70087aeb36df228faf7073afd (patch) | |
tree | 1af64b2ff620500cc62aa18023fe5916d3183b0b /vespabase/src/common-env.sh | |
parent | 2dc4c6b58004d51af887c49760a98804803ab73f (diff) | |
parent | 604af1235637971912bdc36d79decbac3bffe1bb (diff) |
Merge pull request #24519 from vespa-engine/ean/remove-vespa-unprivileged
Remove VESPA_UNPRIVILEGED from start scripts
Diffstat (limited to 'vespabase/src/common-env.sh')
-rwxr-xr-x | vespabase/src/common-env.sh | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 628ebe6b074..41c25be4ac9 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -207,26 +207,45 @@ consider_fallback VESPA_USE_NO_VESPAMALLOC "vespa-rpc-invoke vespa-get-config v fixlimits () { - # Cannot bump limits when not root (for testing) - if [ "${VESPA_UNPRIVILEGED}" = yes ]; then - return 0 - fi - # number of open files: - if varhasvalue file_descriptor_limit; then - ulimit -n ${file_descriptor_limit} || exit 1 - elif [ `ulimit -n` -lt 262144 ]; then - ulimit -n 262144 || exit 1 + max_processes_limit=409600 + if ! varhasvalue file_descriptor_limit; then + file_descriptor_limit=262144 fi - # core file size - if [ `ulimit -c` != "unlimited" ]; then - ulimit -c unlimited - fi + max_processes=$(ulimit -u) + core_size=$(ulimit -c) + file_descriptor=$(ulimit -n) + # Warn if we Cannot bump limits when not root + if [ "$(id -u)" -ne 0 ]; then + # number of open files: + if [ $file_descriptor -lt $file_descriptor_limit ]; then + echo "Expected file descriptor limit to be at least $file_descriptor_limit, was $file_descriptor" + fi + + # core file size + if [ "$core_size" != "unlimited" ]; then + echo "Expected core file size to be unlimited, was $core_size" + fi + + # number of processes/threads + if [ "$max_processes" != "unlimited" ] && [ "$max_processes" -lt "$max_processes_limit" ]; then + echo "Expected max processes to be at least $max_processes_limit, was $max_processes" + fi + else + # number of open files: + if [ $file_descriptor -lt $file_descriptor_limit ]; then + ulimit -n files || exit 1 + fi - # number of processes/threads - max_processes=`ulimit -u` - if [ "$max_processes" != "unlimited" ] && [ "$max_processes" -lt 409600 ]; then - ulimit -u 409600 + # core file size + if [ "$core_size" != "unlimited" ]; then + ulimit -c unlimited + fi + + # number of processes/threads + if [ "$max_processes" != "unlimited" ] && [ "$max_processes" -lt "$max_processes_limit" ]; then + ulimit -u "$max_processes_limit" + fi fi } |