Merge pull request #1265 from rabbitmq/rabbitmq-server-1264

Add vm_memory_calculation_strategy to cuttlefish schema

Author: michaelklishin

priv/schema/rabbit.schema

@@ -683,6 +683,14 @@ end}.
 {mapping, "memory_monitor_interval", "rabbit.memory_monitor_interval",
     [{datatype, integer}]}.
 
+%% When set to rss, RabbitMQ will display the memory usage as reported
+%% by the operating system (RSS value), not by the Erlang VM.
+%%
+%% {vm_memory_calculation_strategy, rss},
+
+{mapping, "vm_memory_calculation_strategy", "rabbit.vm_memory_calculation_strategy",
+    [{datatype, {enum, [rss, erlang]}}]}.
+
 %% Set disk free limit (in bytes). Once free disk space reaches this
 %% lower bound, a disk alarm will be set - see the documentation
 %% listed above for more details.

test/config_schema_SUITE_data/rabbit.snippets

@@ -131,6 +131,18 @@ tcp_listen_options.exit_on_close = false",
        [{vm_memory_high_watermark_paging_ratio,0.75},
         {vm_memory_high_watermark,0.4}]}],
   []},
+ {memory_monitor_interval, "memory_monitor_interval = 5000",
+  [{rabbit,
+       [{memory_monitor_interval, 5000}]}],
+  []},
+ {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = rss",
+  [{rabbit,
+       [{vm_memory_calculation_strategy, rss}]}],
+  []},
+ {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = erlang",
+  [{rabbit,
+       [{vm_memory_calculation_strategy, erlang}]}],
+  []},
  {listeners_tcp_ip,
   "listeners.tcp.1 = 192.168.1.99:5672",
   [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}],