Merge pull request basho#210 from basho/bjs/bugfix/cap_atom_usage

JeetKunDoug · web-flow · commit 83c7a4baeabf · 2017-01-12T10:42:02.000-05:00
Fix RIAK-2702 by restricting possible atom usage to 1000
diff --git a/priv/base/nodetool b/priv/base/nodetool
@@ -189,11 +189,12 @@ nodename(Name) ->
     end.
 
 append_node_suffix(Name, Suffix) ->
+    random:seed(os:timestamp()),
     case string:tokens(Name, "@") of
         [Node, Host] ->
-            list_to_atom(lists:concat([Node, Suffix, os:getpid(), "@", Host]));
+            list_to_atom(lists:concat([Node, Suffix, random:uniform(1000), "@", Host]));
         [Node] ->
-            list_to_atom(lists:concat([Node, Suffix, os:getpid()]))
+            list_to_atom(lists:concat([Node, Suffix, random:uniform(1000)]))
     end.
 
 chkconfig(File) ->
diff --git a/priv/base/runner b/priv/base/runner
@@ -306,8 +306,9 @@ case "$1" in
         echo "Remote Shell: Use \"Ctrl-G q\" to quit."
         echo "q() or init:stop() will terminate the $SCRIPT node."
         shift
+        RAND=$(($(($RANDOM % 1000)) + 1))
         NODE_NAME=${NAME_ARG#* }
-        exec $ERTS_PATH/erl -name c_$$_$NODE_NAME -hidden -remsh $NODE_NAME $COOKIE_ARG $NET_TICKTIME_ARG
+        exec $ERTS_PATH/erl -name c_$RAND_$NODE_NAME -hidden -remsh $NODE_NAME $COOKIE_ARG $NET_TICKTIME_ARG
         ;;
 
     console)
@@ -362,11 +363,11 @@ case "$1" in
         node_up_check
 
         shift
-        MYPID=$$
+        RAND=$(($(($RANDOM % 1000)) + 1))
         NODE_NAME=${NAME_ARG#* }
         $ERTS_PATH/erl -noshell -noinput \
             -pa $RUNNER_PATCH_DIR \
-            -hidden $NAME_PARAM np_etop$MYPID$NAME_HOST $COOKIE_ARG $NET_TICKTIME_ARG \
+            -hidden $NAME_PARAM np_etop$RAND$NAME_HOST $COOKIE_ARG $NET_TICKTIME_ARG \
             -s etop -s erlang halt -output text \
             -node $NODE_NAME \
             $* -tracing off
