diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-05-15 17:23:19 +0300 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-05-19 18:30:03 +0200 |
| commit | 64b133c6b3ca13b623019c689b83c22000ff9a4e (patch) | |
| tree | bb3bd2134f9a61a64dc986b5e2dfed533b5d49d5 /src | |
| parent | b5cc6a04168cf40241788e1dad0938ff7ae3ffe9 (diff) | |
| download | rabbitmq-server-git-64b133c6b3ca13b623019c689b83c22000ff9a4e.tar.gz | |
Start rabbit_alarm before file_handle_cache
Since the FHC now uses memory monitor, we need to make sure it is
running early on. Nothing in rabbit_alarm really depends on the
steps that used to run earlier.
`full` test suite passes.
It may be worth extracting memory and disk monitors into separate
boot steps down the road.
References #134.
Fixes #157.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index b55c129a91..24883dc6d4 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -40,6 +40,13 @@ {requires, pre_boot}, {enables, external_infrastructure}]}). +%% rabbit_alarm currently starts memory and disk space monitors +-rabbit_boot_step({rabbit_alarm, + [{description, "alarm handler"}, + {mfa, {rabbit_alarm, start, []}}, + {requires, pre_boot}, + {enables, external_infrastructure}]}). + -rabbit_boot_step({database, [{mfa, {rabbit_mnesia, init, []}}, {requires, file_handle_cache}, @@ -54,7 +61,8 @@ -rabbit_boot_step({file_handle_cache, [{description, "file handle cache server"}, {mfa, {rabbit, start_fhc, []}}, - {requires, pre_boot}, + %% FHC needs memory monitor to be running + {requires, rabbit_alarm}, {enables, worker_pool}]}). -rabbit_boot_step({worker_pool, @@ -85,12 +93,6 @@ [{description, "kernel ready"}, {requires, external_infrastructure}]}). --rabbit_boot_step({rabbit_alarm, - [{description, "alarm handler"}, - {mfa, {rabbit_alarm, start, []}}, - {requires, kernel_ready}, - {enables, core_initialized}]}). - -rabbit_boot_step({rabbit_memory_monitor, [{description, "memory monitor"}, {mfa, {rabbit_sup, start_restartable_child, |