diff options
| author | Michal Kuratczyk <mkuratczyk@pivotal.io> | 2021-04-22 14:14:41 +0200 |
|---|---|---|
| committer | Michal Kuratczyk <mkuratczyk@pivotal.io> | 2021-04-22 14:14:41 +0200 |
| commit | 76e060474b3f15281413658b0809f23a228b3118 (patch) | |
| tree | ba78743146b378a4ae40bd6bdfe6cc08ac58214c | |
| parent | d62ebea692d51af892327d30a95f06774fb18448 (diff) | |
| download | rabbitmq-server-git-rebalance-ignore-drained.tar.gz | |
Revert "Increase ra:members/1 timeout to 60s"rebalance-ignore-drained
It did not solve the problem and made the failure slower.
This reverts commit 510230302e0adf657b3f6f7c849962ae9796ca2a.
| -rw-r--r-- | deps/rabbit/src/rabbit_quorum_queue.erl | 3 |
1 files changed, 1 insertions, 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, _} -> |