Skip to content

Commit a08c957

Browse files
Merge pull request #9738 from rabbitmq/mergify/bp/v3.12.x/pr-9737
rabbitmq.conf: restrict raft.segment_max_entries to [1; (u16 max value -1)] (backport #9737)
2 parents 5db90d1 + 687f2af commit a08c957

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
@@ -2336,7 +2336,7 @@ end}.
23362336

23372337
{mapping, "raft.segment_max_entries", "ra.segment_max_entries", [
23382338
{datatype, integer},
2339-
{validators, ["non_zero_positive_integer"]}
2339+
{validators, ["non_zero_positive_integer", "non_zero_positive_16_bit_integer"]}
23402340
]}.
23412341

23422342
{translation, "ra.segment_max_entries",
@@ -2576,6 +2576,11 @@ fun(Int) when is_integer(Int) ->
25762576
Int >= 1
25772577
end}.
25782578

2579+
{validator, "non_zero_positive_16_bit_integer", "number should be between 1 and 65535",
2580+
fun(Int) when is_integer(Int) ->
2581+
(Int >= 1) and (Int =< 65535)
2582+
end}.
2583+
25792584
{validator, "valid_regex", "string must be a valid regular expression",
25802585
fun("") -> false;
25812586
(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)