diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-06-08 02:55:26 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-06-08 02:55:26 +0300 |
| commit | d10a3b0a193e33975377997b36a5c625207c3e99 (patch) | |
| tree | 70e8cfd4411069e3739fe52cc2418308759066ee | |
| parent | daa3c3248b51ed4d3fdc2db3851f951838642ca0 (diff) | |
| parent | d59ac4c4700e370a8bb27864fdcd15cc5dcece19 (diff) | |
| download | rabbitmq-server-git-d10a3b0a193e33975377997b36a5c625207c3e99.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_control_main.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index bf50fd6c49..7a343dcc77 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -694,14 +694,10 @@ action(list_consumers, Node, _Args, Opts, Inform, Timeout) -> format_parse_error({_Line, Mod, Err}) -> lists:flatten(Mod:format_error(Err)). sync_queue(Q) -> - rabbit_amqqueue:with( - Q, fun(#amqqueue{pid = QPid}) -> rabbit_amqqueue:sync_mirrors(QPid) end). + rabbit_mirror_queue_misc:sync_queue(Q). cancel_sync_queue(Q) -> - rabbit_amqqueue:with( - Q, fun(#amqqueue{pid = QPid}) -> - rabbit_amqqueue:cancel_sync_mirrors(QPid) - end). + rabbit_mirror_queue_misc:cancel_sync_queue(Q). purge_queue(Q) -> rabbit_amqqueue:with( diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index b188298a9b..5e20324f13 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -24,6 +24,8 @@ maybe_auto_sync/1, maybe_drop_master_after_sync/1, sync_batch_size/1, log_info/3, log_warning/3]). +-export([sync_queue/1, cancel_sync_queue/1]). + %% for testing only -export([module/1]). @@ -366,6 +368,16 @@ maybe_auto_sync(Q = #amqqueue{pid = QPid}) -> ok end. +sync_queue(Q) -> + rabbit_amqqueue:with( + Q, fun(#amqqueue{pid = QPid}) -> rabbit_amqqueue:sync_mirrors(QPid) end). + +cancel_sync_queue(Q) -> + rabbit_amqqueue:with( + Q, fun(#amqqueue{pid = QPid}) -> + rabbit_amqqueue:cancel_sync_mirrors(QPid) + end). + sync_batch_size(#amqqueue{} = Q) -> case policy(<<"ha-sync-batch-size">>, Q) of none -> %% we need this case because none > 1 == true |