Skip to content

Make it possible to configure IP address family for Osiris replica listeners #177

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
Mar 1, 2025
Merged

Make it possible to configure IP address family for Osiris replica listeners #177

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
4 changes: 4 additions & 0 deletions src/osiris_replica.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,11 @@ listener_opts(tcp) ->
ReuseAddr = application:get_env(osiris, replica_reuseaddr, true),
Linger = application:get_env(osiris, replica_linger, true),
LingerTimeout = application:get_env(osiris, replica_linger_timeout, 0),

IPAddrFamily = osiris_util:get_inet_address_family(),

[binary,
IPAddrFamily,
{reuseaddr, ReuseAddr},
{linger, {Linger, LingerTimeout}},
{backlog, 0},
Expand Down
2 changes: 2 additions & 0 deletions src/osiris_replica_reader.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,9 @@ close(ssl, Socket) ->
connect_options() ->
SndBuf = application:get_env(osiris, replica_sndbuf, ?DEF_SND_BUF),
KeepAlive = application:get_env(osiris, replica_keepalive, false),
IPAddrFamily = osiris_util:get_inet_address_family(),
[binary,
IPAddrFamily,
{packet, 0},
{nodelay, true},
{sndbuf, SndBuf},
Expand Down
9 changes: 9 additions & 0 deletions src/osiris_util.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
get_replication_configuration_from_tls_dist/0,
get_replication_configuration_from_tls_dist/1,
get_replication_configuration_from_tls_dist/2,
get_inet_address_family/0,
partition_parallel/3,
normalise_name/1,
get_reader_context/1,
Expand Down Expand Up @@ -239,6 +240,14 @@ eval_term(V) ->
{value, Term, _Bs} = erl_eval:exprs(AbsForm, erl_eval:new_bindings()),
Term.

-spec get_inet_address_family() -> inet | inet6.
get_inet_address_family() ->
case application:get_env(osiris, replica_ip_address_family, inet) of
inet -> inet;
inet6 -> inet6;
_ -> inet
end.

inet_tls_enabled([]) ->
false;
inet_tls_enabled([{proto_dist, ["inet_tls"]} | _]) ->
Expand Down
39 changes: 37 additions & 2 deletions test/osiris_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
%%%===================================================================

all() ->
[{group, tests}].
[
{group, tests},
{group, ipv6}
].

all_tests() ->
[single_node_write,
Expand Down Expand Up @@ -84,10 +87,20 @@ all_tests() ->
combine_ips_hosts_test,
empty_last_segment].

%% Isolated to avoid test interference
ipv6_tests() ->
[
cluster_write_replication_plain_ipv6,
cluster_write_replication_tls_ipv6
].

-define(BIN_SIZE, 800).

groups() ->
[{tests, [], all_tests()}].
[
{tests, [], all_tests()},
{ipv6, [], ipv6_tests()}
].

init_per_suite(Config) ->
osiris:configure_logger(logger),
Expand All @@ -96,10 +109,18 @@ init_per_suite(Config) ->
end_per_suite(_Config) ->
ok.

init_per_group(ipv6, Config) ->
application:set_env(kernel, prevent_overlapping_partitions, false),
application:set_env(osiris, replica_ip_address_family, inet6),
Config;
init_per_group(_Group, Config) ->
application:set_env(kernel, prevent_overlapping_partitions, false),
application:set_env(osiris, replica_ip_address_family, inet),
Config.

end_per_group(ipv6, _Config) ->
application:set_env(osiris, replica_ip_address_family, inet),
ok;
end_per_group(_Group, _Config) ->
ok.

Expand Down Expand Up @@ -143,6 +164,14 @@ extra_init(cluster_write_replication_tls) ->
{verify,verify_peer}
]),
ok;
extra_init(cluster_write_replication_tls_ipv6) ->
extra_init(cluster_write_replication_tls),
application:set_env(osiris, replica_ip_address_family, inet6),
ok;
extra_init(cluster_write_replication_plain_ipv6) ->
application:set_env(osiris, replication_transport, tcp),
application:set_env(osiris, replica_ip_address_family, inet6),
ok;
extra_init(_) ->
application:set_env(osiris, replication_transport, tcp),
ok.
Expand Down Expand Up @@ -287,9 +316,15 @@ start_many_clusters(Config) ->
cluster_write_replication_plain(Config) ->
cluster_write(Config, undefined).

cluster_write_replication_plain_ipv6(Config) ->
cluster_write(Config, undefined).

cluster_write_replication_tls(Config) ->
cluster_write(Config, undefined).

cluster_write_replication_tls_ipv6(Config) ->
cluster_write(Config, undefined).

cluster_write_replication_plain_with_filter(Config) ->
cluster_write(Config, <<"banana">>).

Expand Down