diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-21 14:20:39 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-10-20 14:49:52 +0100 |
| commit | d1f4a9d302c2ad319c58d7aa8aa21e1bc90aa4b5 (patch) | |
| tree | 6ffd3c89bb8a109302cb656e9ca61639d1f532ba | |
| parent | 325e2fcd8a66a2db702e819cc8da1bafde4ac8ed (diff) | |
| download | rabbitmq-server-git-d1f4a9d302c2ad319c58d7aa8aa21e1bc90aa4b5.tar.gz | |
Remove duplicate migration. Match no_ack message
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 1adc038a80..f87205532c 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -2693,10 +2693,6 @@ rabbit_log:error("MIGRATING!!"), OldStore = run_old_persistent_store(RecoveryTerms, StartFunState), %% New store should not be recovered. NewStoreSup = start_new_store_sup(), - lists:map(fun(Queue) -> - migrate_queue(Queue, OldStore, NewStoreSup) - end, - Queues), {ok, Gatherer} = gatherer:start_link(), lists:map( @@ -2726,7 +2722,7 @@ migrate_queue(Queue, OldStore, NewStoreSup) -> rabbit_queue_index:scan_queue_segments( %% We migrate only persistent messages, which is stored in msg_store %% and is not acked yet - fun (_SeqId, MsgId, _MsgProps, true, _IsDelivered, false, OldC) + fun (_SeqId, MsgId, _MsgProps, true, _IsDelivered, no_ack, OldC) when is_binary(MsgId) -> migrate_message(MsgId, OldC, NewStoreClient); (_SeqId, _MsgId, _MsgProps, @@ -2747,7 +2743,7 @@ migrate_message(MsgId, OldC, NewC) -> ok = rabbit_msg_store:remove([MsgId], OldC1), OldC1; _ -> OldC - end; + end. get_new_store_client(#amqqueue{name = #resource{virtual_host = VHost}}, NewStoreSup) -> |