Allow configuring per-mount-point per-queue-type disk alarms

deps/amqp_client/src/amqp_gen_connection.erl

@@ -32,6 +32,7 @@
                 %% connection.block, connection.unblock handler
                 block_handler,
                 blocked_by = sets:new([{version, 2}]),
+                queue_types_published = sets:new([{version, 2}]),
                 closing = false %% #closing{} | false
                }).
 
@@ -214,18 +215,30 @@ handle_cast({register_blocked_handler, HandlerPid},
     {noreply, State1};
 handle_cast({conserve_resources, Source, Conserve},
             #state{blocked_by = BlockedBy} = State) ->
-    WasNotBlocked = sets:is_empty(BlockedBy),
+    WasBlocked = should_block(State),
     BlockedBy1 = case Conserve of
                      true ->
                          sets:add_element(Source, BlockedBy);
                      false ->
                          sets:del_element(Source, BlockedBy)
                  end,
     State1 = State#state{blocked_by = BlockedBy1},
-    case sets:is_empty(BlockedBy1) of
+    case should_block(State1) of
         true ->
             handle_method(#'connection.unblocked'{}, State1);
-        false when WasNotBlocked ->
+        false when not WasBlocked ->
+            handle_method(#'connection.blocked'{}, State1);
+        false ->
+            {noreply, State1}
+    end;
+handle_cast({channel_published_to_queue_type, _ChPid, QT},
+            #state{queue_types_published = QTs} = State) ->
+    WasBlocked = should_block(State),
+    State1 = State#state{queue_types_published = sets:add_element(QT, QTs)},
+    case should_block(State1) of
+        true ->
+            handle_method(#'connection.unblocked'{}, State1);
+        false when not WasBlocked ->
             handle_method(#'connection.blocked'{}, State1);
         false ->
             {noreply, State1}
@@ -274,6 +287,13 @@ i(Item, #state{module = Mod, module_state = MState}) -> Mod:i(Item, MState).
 register_blocked_handler(Pid, HandlerPid) ->
     gen_server:cast(Pid, {register_blocked_handler, HandlerPid}).
 
+should_block(#state{blocked_by = BlockedBy, queue_types_published = QTs}) ->
+    lists:any(fun ({disk, QT}) ->
+                      sets:is_element(QT, QTs);
+                  (_Resource) ->
+                      true
+              end, sets:to_list(BlockedBy)).
+
 %%---------------------------------------------------------------------------
 %% Command handling
 %%---------------------------------------------------------------------------

deps/rabbit/priv/schema/rabbit.schema

@@ -1238,6 +1238,87 @@ fun(Conf) ->
     end
 end}.
 
+%% Tuning of disk monitor polling parameters
+{mapping, "disk_monitor.fast_rate", "rabbit.disk_monitor_fast_rate", [
+    %% Unit: KB/second, for example 250_000 for 250MB/sec.
+    {datatype, [integer]}
+]}.
+{mapping, "disk_monitor.min_interval", "rabbit.disk_monitor_min_interval", [
+    %% Unit: milliseconds.
+    {datatype, [integer]}
+]}.
+{mapping, "disk_monitor.max_interval", "rabbit.disk_monitor_max_interval", [
+    %% Unit: milliseconds.
+    {datatype, [integer]}
+]}.
+
+%% Per-queue-type / per-mount disk alarms
+{mapping, "disk_free_limits.$num.name", "rabbit.disk_free_limits", [
+    {datatype, [binary]}
+]}.
+{mapping, "disk_free_limits.$num.mount", "rabbit.disk_free_limits", [
+    {datatype, [string]}
+]}.
+{mapping, "disk_free_limits.$num.limit", "rabbit.disk_free_limits", [
+    {datatype, [integer, string]},
+    {validators, ["is_supported_information_unit"]}
+]}.
+{mapping, "disk_free_limits.$num.queue_types", "rabbit.disk_free_limits", [
+    {datatype, [binary]}
+]}.
+
+{translation, "rabbit.disk_free_limits",
+fun(Conf) ->
+    case cuttlefish_variable:filter_by_prefix("disk_free_limits", Conf) of
+        [] ->
+            cuttlefish:unset();
+        Settings ->
+            Ls = lists:foldl(
+                   fun ({["disk_free_limits", Num, Key0], Value0}, Acc) ->
+                           Idx = case string:to_integer(Num) of
+                                     {N, []} -> N;
+                                     _ -> cuttlefish:invalid(lists:flatten(io_lib:format("~p could not be parsed as a number", [Num])))
+                                 end,
+                           Key = case Key0 of
+                                     "name" -> name;
+                                     "mount" -> mount;
+                                     "limit" -> limit;
+                                     "queue_types" -> queue_types;
+                                      _ -> cuttlefish:invalid(lists:flatten(io_lib:format("~p is invalid", [Key0])))
+                                 end,
+                           Value = case Key of
+                                       queue_types -> string:split(Value0, ",");
+                                       _ -> Value0
+                                   end,
+                           maps:update_with(
+                             Idx,
+                             fun (#{Key := ExistingValue} = Limit) ->
+                                     cuttlefish:warn(
+                                       io_lib:format("Disk limit ~b has duplicate setting ~ts, "
+                                                     "using ~tp instead of ~tp",
+                                                     [Idx, Key, Value, ExistingValue])),
+                                     Limit#{Key := Value};
+                                 (Limit) ->
+                                     Limit#{Key => Value}
+                             end, #{Key => Value}, Acc);
+                       (Other, _Acc) ->
+                           cuttlefish:invalid(
+                             lists:flatten(io_lib:format("~p is invalid", [Other])))
+                   end, #{}, Settings),
+            maps:fold(
+              fun(_Idx, #{name := Name}, Names) ->
+                      case sets:is_element(Name, Names) of
+                          true ->
+                              cuttlefish:invalid(
+                                lists:flatten(io_lib:format("name ~ts is used by multiple mounts", [Name])));
+                          false ->
+                              sets:add_element(Name, Names)
+                      end
+              end, sets:new([{version, 2}]), Ls),
+            Ls
+    end
+end}.
+
 %%
 %% Clustering
 %% =====================
@@ -2620,6 +2701,20 @@ end}.
     {datatype, {enum, [true, false]}}
 ]}.
 
+%% Classic queue data directory
+{mapping, "classic_queue.data_dir", "rabbit.classic_queue_data_dir", [
+  {datatype, string}
+]}.
+
+{translation, "rabbit.classic_queue_data_dir",
+    fun(Conf) ->
+        case cuttlefish:conf_get("classic_queue.data_dir", Conf, undefined) of
+            undefined -> cuttlefish:unset();
+            Val       -> Val
+        end
+    end
+}.
+
 %%
 %% Backing queue version
 %%
@@ -2776,6 +2871,19 @@ fun(Conf) ->
     end
 end}.
 
+{mapping, "stream.data_dir", "osiris.data_dir", [
+  {datatype, string}
+]}.
+
+{translation, "osiris.data_dir",
+    fun(Conf) ->
+        case cuttlefish:conf_get("stream.data_dir", Conf, undefined) of
+            undefined -> cuttlefish:unset();
+            Val       -> Val
+        end
+    end
+}.
+
 {mapping, "stream.read_ahead", "rabbit.stream_read_ahead",
     [{datatype, {enum, [true, false]}}]}.