diff options
| author | Jerry Kuch <jerryk@vmware.com> | 2011-03-07 13:58:51 -0800 |
|---|---|---|
| committer | Jerry Kuch <jerryk@vmware.com> | 2011-03-07 13:58:51 -0800 |
| commit | b91318d26a38b62276f88261e62d492d21e09830 (patch) | |
| tree | 360dda1a2449a796ffe8bd1cc3a48f4e78fb9d9e | |
| parent | f8a57e254e48ba38b42c1fae1bd358b16c809d74 (diff) | |
| download | rabbitmq-server-b91318d26a38b62276f88261e62d492d21e09830.tar.gz | |
Comment out a dropwhile that tries to goose expiry tests into passing.
| -rw-r--r-- | src/rabbit_mysql_queue.erl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/rabbit_mysql_queue.erl b/src/rabbit_mysql_queue.erl index fba4f35e..e7411827 100644 --- a/src/rabbit_mysql_queue.erl +++ b/src/rabbit_mysql_queue.erl @@ -364,10 +364,6 @@ publish_delivered(true, {SeqId,RS}. -%%############################################################################# -%% THE RUBICON... -%%############################################################################# - %%---------------------------------------------------------------------------- %% dropwhile/2 drops msgs from the head of the queue while there are %% msgs and while the supplied predicate returns true. @@ -404,7 +400,7 @@ dropwhile(Pred, S) -> Result. %%############################################################################# -%% OTHER SIDE OF THE RUBICON... +%% THE RUBICON... %%############################################################################# %%---------------------------------------------------------------------------- @@ -425,10 +421,10 @@ fetch(AckRequired, S) -> % therefore nondeterministic (sometimes passing, sometimes % failing) and should be rewritten, at which point this dropwhile % could be, well, dropped. - Now = timer:now_diff(now(), {0,0,0}), - S1 = dropwhile( - fun (#message_properties{expiry = Expiry}) -> Expiry < Now end, - S), + %% Now = timer:now_diff(now(), {0,0,0}), + %% S1 = dropwhile( + %% fun (#message_properties{expiry = Expiry}) -> Expiry < Now end, + %% S), {atomic, FR} = mnesia:transaction(fun () -> internal_fetch(AckRequired, S1) end), Result = {FR, S1}, @@ -436,6 +432,11 @@ fetch(AckRequired, S) -> callback([]), Result. +%%############################################################################# +%% OTHER SIDE OF THE RUBICON... +%%############################################################################# + + %%---------------------------------------------------------------------------- %% ack/2 acknowledges msgs named by SeqIds. %% |