diff options
| author | Rob Harrop <rharrop@vmware.com> | 2010-09-16 12:49:46 +0100 |
|---|---|---|
| committer | Rob Harrop <rharrop@vmware.com> | 2010-09-16 12:49:46 +0100 |
| commit | 6b3e3ac1e80050d3323c92d21e7b55aeb11d26b2 (patch) | |
| tree | ba83d985f5c8906cf4ea228f420a00f7bd4b849a /src | |
| parent | b09ab1ad0d284a9e6741d3d9a9b102a190b87ea7 (diff) | |
| download | rabbitmq-server-git-6b3e3ac1e80050d3323c92d21e7b55aeb11d26b2.tar.gz | |
fixed test_queue_recover. recovery is working again with per-queue ttl
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_queue_index.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index d0b5d31ae9..b5e92dcaad 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -510,7 +510,7 @@ queue_index_walker_reader(QueueName, Gatherer) -> State = #qistate { segments = Segments, dir = Dir } = recover_journal(blank_state(QueueName, false)), [ok = segment_entries_foldr( - fun (_RelSeq, {{Guid, true}, _IsDelivered, no_ack}, ok) -> + fun (_RelSeq, {{Guid, _MsgProps, true}, _IsDelivered, no_ack}, ok) -> gatherer:in(Gatherer, {Guid, 1}); (_RelSeq, _Value, Acc) -> Acc @@ -535,7 +535,11 @@ read_pub_record_body(Hdl) -> {ok, Bin} = file_handle_cache:read(Hdl, ?GUID_BYTES + ?EXPIRY_BYTES), <<GuidNum:?GUID_BITS, Expiry:?EXPIRY_BITS>> = Bin, <<Guid:?GUID_BYTES/binary>> = <<GuidNum:?GUID_BITS>>, - {Guid, #msg_properties{expiry = Expiry}}. + Exp = case Expiry of + ?NO_EXPIRY -> undefined; + X -> X + end, + {Guid, #msg_properties{expiry = Exp}}. %%---------------------------------------------------------------------------- %% journal manipulation diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 79792786b2..805e89f839 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1971,7 +1971,6 @@ test_queue_recover() -> sender = self(), message = Msg}, [true = rabbit_amqqueue:deliver(QPid, Delivery) || _ <- lists:seq(1, Count)], - io:format("Calling commit~n"), rabbit_amqqueue:commit_all([QPid], TxID, self()), exit(QPid, kill), MRef = erlang:monitor(process, QPid), @@ -1979,7 +1978,6 @@ test_queue_recover() -> after 10000 -> exit(timeout_waiting_for_queue_death) end, rabbit_amqqueue:stop(), - io:format("Restarting queue~n"), ok = rabbit_amqqueue:start(), rabbit_amqqueue:with_or_die( QName, |