peer disc retry

Author: dumbbell

deps/rabbit/src/rabbit_peer_discovery.erl

@@ -698,19 +698,27 @@ is_node_db_ready(Node, FromNode) ->
     end.
 
 erpc_call(Node, Mod, Fun, Args, FromNode) ->
+    erpc_call(Node, Mod, Fun, Args, FromNode, 30000).
+
+erpc_call(Node, Mod, Fun, Args, FromNode, Timeout) when Timeout >= 0 ->
     try
         erpc:call(Node, Mod, Fun, Args)
     catch
-        error:{erpc, Reason} ->
+        error:{erpc, _} = Reason:Stacktrace ->
             Peer = node(),
             _ = catch erpc:call(
                         FromNode,
                         logger, debug,
                         ["Peer discovery: temporary hidden node '~ts' "
                         "failed to connect to '~ts': ~0p",
                          [Peer, Node, Reason]]),
-            timer:sleep(200),
-            erpc_call(Node, Mod, Fun, Args, FromNode)
+            Sleep = 200,
+            timer:sleep(Sleep),
+            NewTimeout = Timeout - Sleep,
+            case NewTimeout >= 0 of
+                true  -> erpc_call(Node, Mod, Fun, Args, FromNode);
+                false -> erlang:raise(error, Reason, Stacktrace)
+            end
     end.
 
 -spec sort_nodes_and_props(NodesAndProps) ->