Only set ulimit if needed

1 files changed, 10 insertions, 2 deletions

diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh
index a2c55439a3f..37c2669e885 100755
--- a/vespabase/src/common-env.sh
+++ b/vespabase/src/common-env.sh
@@ -153,8 +153,16 @@ fixlimits () {
     elif [ `ulimit -n` -lt 16384 ]; then
         ulimit -n 16384 || exit 1
     fi
-    ulimit -c unlimited # core file size
-    ulimit -u 409600    # number of processes/threads
+
+    # core file size
+    if [ `ulimit -c` != "unlimited" ]; then
+        ulimit -c unlimited
+    fi
+
+    # number of processes/threads
+    if [ `ulimit -u` -lt 409600 ]; then
+        ulimit -u 409600
+    fi
 }
 
 checkjava () {