diff options
| -rw-r--r-- | src/rabbit_amqqueue.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index e026279fa5..6f299a9eff 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -407,10 +407,12 @@ with_or_die(Name, F) -> ({absent, Q, Reason}) -> rabbit_misc:absent(Q, Reason) end). -%% TODO we could still be wrong here if we happen to call in the -%% middle of a crash-failover. We could try to figure out whether -%% that's happening by looking for the supervisor - but we'd need some -%% additional book keeping to know what it is... +%% TODO we could say we are crashed when we mean recovering if we +%% happen to call in the middle of a crash-failover. We could try to +%% figure out whether that's happening by looking for the supervisor - +%% but we'd need some additional book keeping to know what it is. And +%% it will just mean a temporary glitch while crashing, which is +%% fairly tolerable. crashed_or_recovering(#amqqueue{pid = QPid, slave_pids = []}) -> case lists:member(node(QPid), [node() | nodes()]) of true -> crashed; diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index d37e95c348..12a3c9f0a6 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -206,7 +206,6 @@ recovery_barrier(BarrierPid) -> {'DOWN', MRef, process, _, _} -> ok end. -%% We have been promoted init_with_backing_queue_state(Q = #amqqueue{exclusive_owner = Owner}, BQ, BQS, RateTRef, Deliveries, Senders, MTC) -> case Owner of |