From 76e060474b3f15281413658b0809f23a228b3118 Mon Sep 17 00:00:00 2001 From: Michal Kuratczyk Date: Thu, 22 Apr 2021 14:14:41 +0200 Subject: Revert "Increase ra:members/1 timeout to 60s" It did not solve the problem and made the failure slower. This reverts commit 510230302e0adf657b3f6f7c849962ae9796ca2a. --- deps/rabbit/src/rabbit_quorum_queue.erl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl index 2f4ab807dd..9075ec1df1 100644 --- a/deps/rabbit/src/rabbit_quorum_queue.erl +++ b/deps/rabbit/src/rabbit_quorum_queue.erl @@ -104,7 +104,6 @@ -define(TICK_TIMEOUT, 5000). %% the ra server tick time -define(DELETE_TIMEOUT, 5000). -define(ADD_MEMBER_TIMEOUT, 5000). --define(TRANSFER_TIMEOUT, 60000). %%----------- rabbit_queue_type --------------------------------------------- @@ -1174,7 +1173,7 @@ transfer_leadership(Q, Destination) -> {RaName, _} = Pid = amqqueue:get_pid(Q), case ra:transfer_leadership(Pid, {RaName, Destination}) of ok -> - case ra:members(Pid, ?TRANSFER_TIMEOUT) of + case ra:members(Pid) of {_, _, {_, NewNode}} -> {migrated, NewNode}; {timeout, _} -> -- cgit v1.2.1