Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Commit 9547140

Browse files
Merge pull request #251 from rabbitmq/rabbitmq-server-1522-net-ticktime-in-new-config-format
Handle {ongoing_change_to, NewValue} responses
2 parents d1055d3 + c8cf031 commit 9547140

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/rabbit_misc.erl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,8 +1172,14 @@ rpc_call(Node, Mod, Fun, Args) ->
11721172
rpc_call(Node, Mod, Fun, Args, Timeout) ->
11731173
case rpc:call(Node, net_kernel, get_net_ticktime, [], Timeout) of
11741174
{badrpc, _} = E -> E;
1175-
Time -> _ = net_kernel:set_net_ticktime(Time, 0),
1176-
rpc:call(Node, Mod, Fun, Args, Timeout)
1175+
ignored ->
1176+
rpc:call(Node, Mod, Fun, Args, Timeout);
1177+
{ongoing_change_to, NewValue} ->
1178+
_ = net_kernel:set_net_ticktime(NewValue, 0),
1179+
rpc:call(Node, Mod, Fun, Args, Timeout);
1180+
Time ->
1181+
_ = net_kernel:set_net_ticktime(Time, 0),
1182+
rpc:call(Node, Mod, Fun, Args, Timeout)
11771183
end.
11781184

11791185
guess_number_of_cpu_cores() ->

0 commit comments

Comments
 (0)