diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-27 17:56:01 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-27 17:56:01 +0000 |
| commit | 8a33d0617d912504364421f217aff8c93b17fec5 (patch) | |
| tree | dbf5fcbd9a92264202e952084393babb93cd8165 /src | |
| parent | 4e03a59592424036d3880bf80c5eeaf54c8162f3 (diff) | |
| download | rabbitmq-server-git-8a33d0617d912504364421f217aff8c93b17fec5.tar.gz | |
Removal of unnecessary clause in handle_info for queue process as prefetcher has gone. Bump rabbit supervisor to allow all processes to take as long as necessary to exit. This should ensure cached data gets flushed out.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 405d170bea..9ef49ac598 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -284,7 +284,8 @@ start_child(Mod) -> start_child(Mod, Args) -> {ok,_} = supervisor:start_child(rabbit_sup, {Mod, {Mod, start_link, Args}, - transient, 5000, worker, [Mod]}), + %% 4294967295 is 2^32 - 1, which is the highest value allowed + transient, 4294967295, worker, [Mod]}), ok. ensure_working_log_handlers() -> diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 7364c479ff..9b9515c1dd 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -903,18 +903,12 @@ handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, State) -> {ok, NewState} -> noreply(NewState); {stop, NewState} -> {stop, normal, NewState} end; -handle_info({'EXIT', _DownPid, normal}, State) -> - %% because we have trap_exit on, we'll pick up here the prefetcher - %% going down. We probably need to make sure that we really are - %% just picking up the prefetcher here. It's safe to ignore it - %% though, provided 'normal' - noreply(State); handle_info(timeout, State = #q{variable_queue_state = VQS}) -> noreply( run_message_queue( State#q{variable_queue_state = - rabbit_variable_queue:tx_commit_from_vq(VQS)})); + rabbit_variable_queue:tx_commit_from_vq(VQS)})); handle_info({file_handle_cache, maximum_eldest_since_use, Age}, State) -> ok = file_handle_cache:set_maximum_since_use(Age), @@ -927,7 +921,7 @@ handle_info(Info, State) -> handle_pre_hibernate(State = #q{ variable_queue_state = VQS }) -> VQS1 = rabbit_variable_queue:flush_journal(VQS), %% no activity for a while == 0 egress and ingress rates - DesiredDuration = + DesiredDuration = rabbit_memory_monitor:report_queue_duration(self(), infinity), VQS2 = rabbit_variable_queue:set_queue_ram_duration_target( DesiredDuration, VQS1), |