Merge pull request #2965 from rabbitmq/rabbitmq-server-2964

michaelklishin · web-flow · commit 0a48a2a05ba8 · 2021-04-10T18:41:26.000+03:00
CLI: handle {:relative, val} cases when formatting effective memory watermark value
diff --git a/deps/rabbit/src/rabbit_disk_monitor.erl b/deps/rabbit/src/rabbit_disk_monitor.erl
@@ -66,7 +66,7 @@
 
 %%----------------------------------------------------------------------------
 
--type disk_free_limit() :: (integer() | string() | {'mem_relative', float() | integer()}).
+-type disk_free_limit() :: integer() | {'absolute', integer()} | string() | {'mem_relative', float() | integer()}.
 
 %%----------------------------------------------------------------------------
 %% Public API
@@ -273,6 +273,8 @@ parse_free_win32(CommandResult) ->
 interpret_limit({mem_relative, Relative})
     when is_number(Relative) ->
     round(Relative * vm_memory_monitor:get_total_memory());
+interpret_limit({absolute, Absolute}) ->
+    interpret_limit(Absolute);
 interpret_limit(Absolute) ->
     case rabbit_resource_monitor_misc:parse_information_unit(Absolute) of
         {ok, ParsedAbsolute} -> ParsedAbsolute;
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/core/memory.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/core/memory.ex
@@ -56,6 +56,12 @@ defmodule RabbitMQ.CLI.Core.Memory do
   def formatted_watermark(val) when is_float(val) do
     %{relative: val}
   end
+  def formatted_watermark({:relative, val}) when is_float(val) do
+    %{relative: val}
+  end
+  def formatted_watermark(:infinity) do
+    %{relative: 1.0}
+  end
   def formatted_watermark({:absolute, val}) do
     %{absolute: parse_watermark(val)}
   end
