Skip to content

Commit a8872fd

Browse files
Merge pull request #9737 from rabbitmq/rabbitmq-server-9733
rabbitmq.conf: restrict raft.segment_max_entries to [1; (u16 max value -1)]
2 parents c374a42 + e87a399 commit a8872fd

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2365,7 +2365,7 @@ end}.
23652365

23662366
{mapping, "raft.segment_max_entries", "ra.segment_max_entries", [
23672367
{datatype, integer},
2368-
{validators, ["non_zero_positive_integer"]}
2368+
{validators, ["non_zero_positive_integer", "non_zero_positive_16_bit_integer"]}
23692369
]}.
23702370

23712371
{translation, "ra.segment_max_entries",
@@ -2629,6 +2629,11 @@ fun(Int) when is_integer(Int) ->
26292629
Int >= 1
26302630
end}.
26312631

2632+
{validator, "non_zero_positive_16_bit_integer", "number should be between 1 and 65535",
2633+
fun(Int) when is_integer(Int) ->
2634+
(Int >= 1) and (Int =< 65535)
2635+
end}.
2636+
26322637
{validator, "valid_regex", "string must be a valid regular expression",
26332638
fun("") -> false;
26342639
(String) -> {Res, _ } = re:compile(String),

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,9 +851,9 @@ credential_validator.regexp = ^abc\\d+",
851851
[]},
852852

853853
{raft_segment_max_entries,
854-
"raft.segment_max_entries = 65536",
854+
"raft.segment_max_entries = 32768",
855855
[{ra, [
856-
{segment_max_entries, 65536}
856+
{segment_max_entries, 32768}
857857
]}],
858858
[]},
859859

0 commit comments

Comments
 (0)