root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #50 from rabbitmq/rabbitmq-server-590 

Pass connection Pid to exclusive queue deletion.
This commit is contained in:
Michael Klishin 2016-02-05 23:47:12 +03:00
parent 0ba47561f6 179e9f4825
commit 4ed7cfbe89
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/rabbit_common/mk/rabbitmq-build.mk vendored
View File

@ -2,7 +2,9 @@
LAGER_EXTRA_SINKS += rabbit_log \ LAGER_EXTRA_SINKS += rabbit_log \
rabbit_channel \ rabbit_channel \
rabbit_connection \ rabbit_connection \
rabbit_mirroring rabbit_mirroring \
rabbit_queue \
rabbit_federation
lager_extra_sinks = $(subst $(space),$(comma),$(LAGER_EXTRA_SINKS)) lager_extra_sinks = $(subst $(space),$(comma),$(LAGER_EXTRA_SINKS))
RMQ_ERLC_OPTS += +'{parse_transform,lager_transform}' \ RMQ_ERLC_OPTS += +'{parse_transform,lager_transform}' \

9
deps/rabbit_common/src/rabbit_amqqueue.erl vendored
View File

@ -17,8 +17,8 @@
-module(rabbit_amqqueue). -module(rabbit_amqqueue).
-export([recover/0, stop/0, start/1, declare/5, declare/6, -export([recover/0, stop/0, start/1, declare/5, declare/6,
delete_immediately/1, delete/3, purge/1, forget_all_durable/1, delete_immediately/1, delete_exclusive/2, delete/3, purge/1,
delete_crashed/1, delete_crashed_internal/1]). forget_all_durable/1, delete_crashed/1, delete_crashed_internal/1]).
-export([pseudo_queue/2, immutable/1]). -export([pseudo_queue/2, immutable/1]).
-export([lookup/1, not_found_or_absent/1, with/2, with/3, with_or_die/2, -export([lookup/1, not_found_or_absent/1, with/2, with/3, with_or_die/2,
assert_equivalence/5, assert_equivalence/5,
@ -139,6 +139,7 @@
(rabbit_types:amqqueue()) (rabbit_types:amqqueue())
-> {'ok', non_neg_integer(), non_neg_integer()}). -> {'ok', non_neg_integer(), non_neg_integer()}).
-spec(delete_immediately/1 :: (qpids()) -> 'ok'). -spec(delete_immediately/1 :: (qpids()) -> 'ok').
-spec(delete_exclusive/2 :: (qpids(), pid()) -> 'ok').
-spec(delete/3 :: -spec(delete/3 ::
(rabbit_types:amqqueue(), 'false', 'false') (rabbit_types:amqqueue(), 'false', 'false')
-> qlen(); -> qlen();
@ -662,6 +663,10 @@ get_queue_consumer_info(Q, ConsumerInfoKeys) ->
stat(#amqqueue{pid = QPid}) -> delegate:call(QPid, stat). stat(#amqqueue{pid = QPid}) -> delegate:call(QPid, stat).
delete_exclusive(QPids, ConnId) ->
[gen_server2:cast(QPid, {delete_exclusive, ConnId}) || QPid <- QPids],
ok.
delete_immediately(QPids) -> delete_immediately(QPids) ->
[gen_server2:cast(QPid, delete_immediately) || QPid <- QPids], [gen_server2:cast(QPid, delete_immediately) || QPid <- QPids],
ok. ok.

4
deps/rabbit_common/src/rabbit_queue_collector.erl vendored
View File

@ -64,7 +64,7 @@ handle_call({register, QPid}, _From,
State = #state{monitors = QMons, delete_from = Deleting}) -> State = #state{monitors = QMons, delete_from = Deleting}) ->
case Deleting of case Deleting of
undefined -> ok; undefined -> ok;
_ -> ok = rabbit_amqqueue:delete_immediately([QPid]) _ -> ok = rabbit_amqqueue:delete_exclusive([QPid], Deleting)
end, end,
{reply, ok, State#state{monitors = pmon:monitor(QPid, QMons)}}; {reply, ok, State#state{monitors = pmon:monitor(QPid, QMons)}};
@ -72,7 +72,7 @@ handle_call(delete_all, From, State = #state{monitors = QMons,
delete_from = undefined}) -> delete_from = undefined}) ->
case pmon:monitored(QMons) of case pmon:monitored(QMons) of
[] -> {reply, ok, State#state{delete_from = From}}; [] -> {reply, ok, State#state{delete_from = From}};
QPids -> ok = rabbit_amqqueue:delete_immediately(QPids), QPids -> ok = rabbit_amqqueue:delete_exclusive(QPids, From),
{noreply, State#state{delete_from = From}} {noreply, State#state{delete_from = From}}
end. end.