Merge pull request #15014 from rabbitmq/mergify/bp/v4.2.x/pr-14814

Allow configuring osiris data_dir in Cuttlefish config (backport #14814)

Author: michaelklishin

deps/rabbit/priv/schema/rabbit.schema

@@ -2799,8 +2799,19 @@ fun(Conf) ->
     end
 end}.
 
-%% See github.com/rabbitmq/osiris#192 and https://github.com/rabbitmq/rabbitmq-server/commit/9f162dfd01c1516d168e7d1fad39d33a929756e5
-%% Enables read-head
+{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]}, integer, string]}]}.
 

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

@@ -1278,6 +1278,7 @@ credential_validator.regexp = ^abc\\d+",
       {stream_read_ahead, false}
      ]}],
    []},
+
   {stream_read_ahead_limit_bytes,
    "
     stream.read_ahead = 8192
@@ -1293,5 +1294,16 @@ credential_validator.regexp = ^abc\\d+",
    [{rabbit, [
       {stream_read_ahead, "8KiB"}
      ]}],
+   []},
+
+  %%
+  %% Stream data dir
+  %%
+
+  {stream_data_dir,
+   "stream.data_dir = /data/rabbitmq/stream",
+   [{osiris, [
+      {data_dir, "/data/rabbitmq/stream"}
+     ]}],
    []}
 ].