Browse Source

Do not use no_connect option while sending.

This can be better controlled with '-kernel dist_auto_connect never'.
Roberto Ostinelli 3 years ago
parent
commit
fbbffc51c5
3 changed files with 5 additions and 5 deletions
  1. 3 3
      src/syn_gen_scope.erl
  2. 1 1
      test/syn_registry_SUITE.erl
  3. 1 1
      test/syn_test_suite_helper.erl

+ 3 - 3
src/syn_gen_scope.erl

@@ -127,7 +127,7 @@ broadcast_all_cluster(Message, #state{multicast_pid = MulticastPid} = State) ->
 
 
 -spec send_to_node(RemoteNode :: node(), Message :: term(), #state{}) -> any().
 -spec send_to_node(RemoteNode :: node(), Message :: term(), #state{}) -> any().
 send_to_node(RemoteNode, Message, #state{process_name = ProcessName}) ->
 send_to_node(RemoteNode, Message, #state{process_name = ProcessName}) ->
-    erlang:send({ProcessName, RemoteNode}, Message, [noconnect]).
+    {ProcessName, RemoteNode} ! Message.
 
 
 %% ===================================================================
 %% ===================================================================
 %% Callbacks
 %% Callbacks
@@ -329,13 +329,13 @@ multicast_loop() ->
     receive
     receive
         {broadcast, Message, ExcludedNodes, #state{process_name = ProcessName, nodes_map = NodesMap}} ->
         {broadcast, Message, ExcludedNodes, #state{process_name = ProcessName, nodes_map = NodesMap}} ->
             lists:foreach(fun(RemoteNode) ->
             lists:foreach(fun(RemoteNode) ->
-                erlang:send({ProcessName, RemoteNode}, Message, [noconnect])
+                {ProcessName, RemoteNode} ! Message
             end, maps:keys(NodesMap) -- ExcludedNodes),
             end, maps:keys(NodesMap) -- ExcludedNodes),
             multicast_loop();
             multicast_loop();
 
 
         {broadcast_all_cluster, Message, #state{process_name = ProcessName}} ->
         {broadcast_all_cluster, Message, #state{process_name = ProcessName}} ->
             lists:foreach(fun(RemoteNode) ->
             lists:foreach(fun(RemoteNode) ->
-                erlang:send({ProcessName, RemoteNode}, Message, [noconnect])
+                {ProcessName, RemoteNode} ! Message
             end, nodes()),
             end, nodes()),
             multicast_loop();
             multicast_loop();
 
 

+ 1 - 1
test/syn_registry_SUITE.erl

@@ -887,7 +887,7 @@ three_nodes_cluster_changes(Config) ->
 
 
     %% register
     %% register
     ok = rpc:call(SlaveNode1, syn, register, ["proc-1", PidRemoteOn1, "meta-1"]),
     ok = rpc:call(SlaveNode1, syn, register, ["proc-1", PidRemoteOn1, "meta-1"]),
-    ok = rpc:call(SlaveNode1, syn, register, ["proc-2", PidRemoteOn2, "meta-2"]),
+    ok = rpc:call(SlaveNode2, syn, register, ["proc-2", PidRemoteOn2, "meta-2"]),
     ok = rpc:call(SlaveNode1, syn, register, [custom_scope_bc, "BC-proc-1", PidRemoteOn1, "meta-1"]),
     ok = rpc:call(SlaveNode1, syn, register, [custom_scope_bc, "BC-proc-1", PidRemoteOn1, "meta-1"]),
     ok = rpc:call(SlaveNode1, syn, register, [custom_scope_bc, "BC-proc-1 alias", PidRemoteOn1, "meta-1 alias"]),
     ok = rpc:call(SlaveNode1, syn, register, [custom_scope_bc, "BC-proc-1 alias", PidRemoteOn1, "meta-1 alias"]),
 
 

+ 1 - 1
test/syn_test_suite_helper.erl

@@ -54,7 +54,7 @@
 start_slave(NodeShortName) ->
 start_slave(NodeShortName) ->
     {ok, Node} = ct_slave:start(NodeShortName, [
     {ok, Node} = ct_slave:start(NodeShortName, [
         {boot_timeout, 10},
         {boot_timeout, 10},
-        {erl_flags, "-connect_all false"}
+        {erl_flags, "-connect_all false -kernel dist_auto_connect never"}
     ]),
     ]),
     CodePath = code:get_path(),
     CodePath = code:get_path(),
     true = rpc:call(Node, code, set_path, [CodePath]),
     true = rpc:call(Node, code, set_path, [CodePath]),