Skip to content

Expose Osiris replica IP address family to rabbitmq.conf #15011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
+49 −4
Merged

Expose Osiris replica IP address family to rabbitmq.conf #15011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions deps/rabbit/priv/schema/rabbit.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2756,6 +2756,23 @@ end}.
end
}.

{mapping, "stream.replication.address_family", "osiris.replica_ip_address_family", [
{datatype, [{enum, [inet6, inet, ipv6, ipv4]}]}
]}.

{translation, "osiris.replica_ip_address_family",
fun(Conf) ->
case cuttlefish:conf_get("stream.replication.address_family", Conf, undefined) of
undefined -> cuttlefish:unset();
inet -> inet;
inet6 -> inet6;
ipv4 -> inet;
ipv6 -> inet6;
Other -> cuttlefish:invalid(io_lib:format("~p is not a supported address family", [Other]))
end
end
}.

{mapping, "stream.replication.port_range.min", "osiris.port_range", [
{datatype, [integer]},
{validators, ["non_zero_positive_integer"]}
Expand Down
36 changes: 32 additions & 4 deletions deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,10 +1198,38 @@ credential_validator.regexp = ^abc\\d+",
[]},

%%
%% Stream replication port range
%% Stream replication
%%

{stream_replication_port_range,
{stream_replication_address_family_ipv4_case1,
"stream.replication.address_family = inet",
[{osiris, [
{replica_ip_address_family, inet}
]}],
[]},

{stream_replication_address_family_ipv4_case2,
"stream.replication.address_family = ipv4",
[{osiris, [
{replica_ip_address_family, inet}
]}],
[]},

{stream_replication_address_family_ipv6_case1,
"stream.replication.address_family = inet6",
[{osiris, [
{replica_ip_address_family, inet6}
]}],
[]},

{stream_replication_address_family_ipv6_case2,
"stream.replication.address_family = ipv6",
[{osiris, [
{replica_ip_address_family, inet6}
]}],
[]},

{stream_replication_port_range_min_max,
"
stream.replication.port_range.min = 4000
stream.replication.port_range.max = 4600
Expand All @@ -1211,7 +1239,7 @@ credential_validator.regexp = ^abc\\d+",
]}],
[]},

{stream_replication_port_range,
{stream_replication_port_range_min_only,
"
stream.replication.port_range.min = 4000
",
Expand All @@ -1220,7 +1248,7 @@ credential_validator.regexp = ^abc\\d+",
]}],
[]},

{stream_replication_port_range,
{stream_replication_port_range_max,
"
stream.replication.port_range.max = 4600
",
Expand Down
Loading