diff options
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 1 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_queue_mode_manager.erl | 30 |
3 files changed, 18 insertions, 17 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 9915727bd9..1cf6c6baff 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -127,6 +127,7 @@ if "%RABBITMQ_MNESIA_DIR%"=="" ( -os_mon memsup_system_only true ^
-os_mon system_memory_high_watermark 0.95 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
+-mnesia dump_log_write_threshold 10000 ^
%CLUSTER_CONFIG% ^
%RABBITMQ_SERVER_START_ARGS% ^
%*
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 0ead9533c9..586c06c0c6 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -281,11 +281,11 @@ action(list_connections, Node, Args, Inform) -> action(reduce_memory_footprint, Node, _Args, Inform) -> Inform("Reducing memory footprint", []), - call(Node, {rabbit_queue_mode_manager, reduce_memory_usage, []}); + call(Node, {rabbit_queue_mode_manager, reduce_memory_footprint, []}); action(increase_memory_footprint, Node, _Args, Inform) -> Inform("Reducing memory footprint", []), - call(Node, {rabbit_queue_mode_manager, increase_memory_usage, []}); + call(Node, {rabbit_queue_mode_manager, increase_memory_footprint, []}); action(Command, Node, Args, Inform) -> {VHost, RemainingArgs} = parse_vhost_flag(Args), diff --git a/src/rabbit_queue_mode_manager.erl b/src/rabbit_queue_mode_manager.erl index c905d99b72..6bb197ef21 100644 --- a/src/rabbit_queue_mode_manager.erl +++ b/src/rabbit_queue_mode_manager.erl @@ -38,8 +38,8 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --export([register/1, change_memory_usage/2, - reduce_memory_usage/0, increase_memory_usage/0]). +-export([register/1, change_memory_footprint/2, + reduce_memory_footprint/0, increase_memory_footprint/0]). -define(SERVER, ?MODULE). @@ -53,18 +53,18 @@ start_link() -> register(Pid) -> gen_server2:call(?SERVER, {register, Pid}). -change_memory_usage(_Pid, Conserve) -> - gen_server2:cast(?SERVER, {change_memory_usage, Conserve}). +change_memory_footprint(_Pid, Conserve) -> + gen_server2:cast(?SERVER, {change_memory_footprint, Conserve}). -reduce_memory_usage() -> - gen_server2:cast(?SERVER, {change_memory_usage, true}). +reduce_memory_footprint() -> + gen_server2:cast(?SERVER, {change_memory_footprint, true}). -increase_memory_usage() -> - gen_server2:cast(?SERVER, {change_memory_usage, false}). +increase_memory_footprint() -> + gen_server2:cast(?SERVER, {change_memory_footprint, false}). init([]) -> process_flag(trap_exit, true), - ok = rabbit_alarm:register(self(), {?MODULE, change_memory_usage, []}), + ok = rabbit_alarm:register(self(), {?MODULE, change_memory_footprint, []}), {ok, #state { mode = unlimited, queues = [] }}. @@ -77,26 +77,26 @@ handle_call({register, Pid}, _From, end, {reply, {ok, Result}, State #state { queues = [Pid | Qs] }}. -handle_cast({change_memory_usage, true}, +handle_cast({change_memory_footprint, true}, State = #state { mode = disk_only }) -> {noreply, State}; -handle_cast({change_memory_usage, true}, +handle_cast({change_memory_footprint, true}, State = #state { mode = ram_disk }) -> constrain_queues(true, State #state.queues), {noreply, State #state { mode = disk_only }}; -handle_cast({change_memory_usage, true}, +handle_cast({change_memory_footprint, true}, State = #state { mode = unlimited }) -> ok = rabbit_disk_queue:to_disk_only_mode(), {noreply, State #state { mode = ram_disk }}; -handle_cast({change_memory_usage, false}, +handle_cast({change_memory_footprint, false}, State = #state { mode = unlimited }) -> {noreply, State}; -handle_cast({change_memory_usage, false}, +handle_cast({change_memory_footprint, false}, State = #state { mode = ram_disk }) -> ok = rabbit_disk_queue:to_ram_disk_mode(), {noreply, State #state { mode = unlimited }}; -handle_cast({change_memory_usage, false}, +handle_cast({change_memory_footprint, false}, State = #state { mode = disk_only }) -> constrain_queues(false, State #state.queues), {noreply, State #state { mode = ram_disk }}. |