summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiana Corbacho <diana@rabbitmq.com>2017-05-26 13:52:03 +0100
committerDiana Corbacho <diana@rabbitmq.com>2017-05-26 13:52:03 +0100
commiteb7e6afd06f6e3c415d0350d295e097540bfd9cf (patch)
treef089aa8bc3827fcfcf83fe8613624197ffa51aeb /src
parentced8290812301cb2101b429d0cf1a6d7916daba2 (diff)
downloadrabbitmq-server-git-eb7e6afd06f6e3c415d0350d295e097540bfd9cf.tar.gz
Use new config parameter total_memory_available_override_value to set total memory
rabbitmq-server#1224 [#145450413]
Diffstat (limited to 'src')
-rw-r--r--src/vm_memory_monitor.erl30
1 files changed, 23 insertions, 7 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 7c44cb8e12..2fbd269f29 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -79,13 +79,20 @@
%%----------------------------------------------------------------------------
get_total_memory() ->
- try
- get_total_memory(os:type())
- catch _:Error ->
- rabbit_log:warning(
- "Failed to get total system memory: ~n~p~n~p~n",
- [Error, erlang:get_stacktrace()]),
- unknown
+ case application:get_env(rabbit, total_memory_available_override_value) of
+ {ok, Value} ->
+ case rabbit_resource_monitor_misc:parse_information_unit(Value) of
+ {ok, ParsedTotal} ->
+ ParsedTotal;
+ {error, parse_error} ->
+ rabbit_log:warning(
+ "The override value for the total memmory available is "
+ "not a valid value: ~p, getting total from the system.~n",
+ [Value]),
+ get_total_memory_from_os()
+ end;
+ undefined ->
+ get_total_memory_from_os()
end.
get_vm_limit() -> get_vm_limit(os:type()).
@@ -164,6 +171,15 @@ code_change(_OldVsn, State, _Extra) ->
%%----------------------------------------------------------------------------
%% Server Internals
%%----------------------------------------------------------------------------
+get_total_memory_from_os() ->
+ try
+ get_total_memory(os:type())
+ catch _:Error ->
+ rabbit_log:warning(
+ "Failed to get total system memory: ~n~p~n~p~n",
+ [Error, erlang:get_stacktrace()]),
+ unknown
+ end.
set_mem_limits(State, MemLimit) ->
case erlang:system_info(wordsize) of