Merge pull request #973 from martincox/develop-3.0

Add ulimit check on startup.
basho · May 10, 2019 · 1e6f181 · 1e6f181
2 parents 0b59c63 + af6aecd
commit 1e6f181
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/rebar.config b/rebar.config
@@ -84,7 +84,9 @@
          {template, "rel/files/riak-debug",        "bin/riak-debug"},
          {template, "rel/files/riak-chkconfig",    "bin/riak-chkconfig"},
          {template, "rel/files/riak-repl",         "bin/riak-repl"},
-	 {template, "rel/files/check_riak_config", "bin/check_riak_config"}
+         {template, "rel/files/check_riak_config", "bin/check_riak_config"},
+
+         {copy, "rel/files/check_ulimit", "bin/hooks/prestart/check_ulimit"}
     ]},
 
     {generate_start_script, true},
@@ -97,6 +99,9 @@
     ]},
 
     {extended_start_script_hooks, [
+        {pre_start, [
+            {custom, "hooks/prestart/check_ulimit"}
+        ]},
         {post_start, [
             {wait_for_process, riak_core_node_watcher}
         ]}

diff --git a/rel/files/check_ulimit b/rel/files/check_ulimit
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ULIMIT_WARN=65536
+ULIMIT_F=`ulimit -n`
+
+if [ "$ULIMIT_F" -lt $ULIMIT_WARN ]; then
+    echo "!!!!"
+    echo "!!!! WARNING: ulimit -n is ${ULIMIT_F}; ${ULIMIT_WARN} is the recommended minimum."
+    echo "!!!!"
+fi