Merge pull request #209 from basho/dr/merge_2.0_to_develop

borshop · borshop · commit a463682ba86e · 2016-02-03T15:24:13.000-07:00
merge 2.0 to develop for increase in ERL_MAX_PORTS (+Q) - (RIAK-2332)

Reviewed-by: mrallen1
diff --git a/priv/erlang_vm.schema b/priv/erlang_vm.schema
@@ -162,7 +162,7 @@
 %% Valid range is 1024-134217727
 {mapping, "erlang.max_ports",
   cuttlefish:otp("R16", "vm_args.+Q", "vm_args.-env ERL_MAX_PORTS"), [
-  {default, 65536},
+  {default, 262144},
   {datatype, integer},
   {validators, ["range4ports"]}
 ]}.
diff --git a/test/erlang_vm_schema_tests.erl b/test/erlang_vm_schema_tests.erl
@@ -30,7 +30,7 @@ basic_schema_test() ->
     cuttlefish_unit:assert_not_configured(Config, "kernel.inet_dist_listen_max"),
     case erlang:system_info(otp_release) of
         [$R, $1, N|_] when N >= $6 ->
-            cuttlefish_unit:assert_config(Config, "vm_args.+Q", 65536),
+            cuttlefish_unit:assert_config(Config, "vm_args.+Q", 262144),
             cuttlefish_unit:assert_config(Config, "vm_args.+e", 256000);
         _ ->
             cuttlefish_unit:assert_config(Config, "vm_args.-env ERL_MAX_PORTS", 65536),
