From 687f2af0688387ddb640a7fd84b37a2a792900bd Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Thu, 19 Oct 2023 11:27:14 -0400 Subject: [PATCH] Closes #9733 (cherry picked from commit e87a3995c5ff47c2188d5cbb28cdcb8a106a06bb) --- deps/rabbit/priv/schema/rabbit.schema | 7 ++++++- deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index b5f86d3bbb01..73fdf632c900 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -2336,7 +2336,7 @@ end}. {mapping, "raft.segment_max_entries", "ra.segment_max_entries", [ {datatype, integer}, - {validators, ["non_zero_positive_integer"]} + {validators, ["non_zero_positive_integer", "non_zero_positive_16_bit_integer"]} ]}. {translation, "ra.segment_max_entries", @@ -2576,6 +2576,11 @@ fun(Int) when is_integer(Int) -> Int >= 1 end}. +{validator, "non_zero_positive_16_bit_integer", "number should be between 1 and 65535", +fun(Int) when is_integer(Int) -> + (Int >= 1) and (Int =< 65535) +end}. + {validator, "valid_regex", "string must be a valid regular expression", fun("") -> false; (String) -> {Res, _ } = re:compile(String), diff --git a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets index d0b0cf218ec6..26f66c1994e9 100644 --- a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets +++ b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets @@ -851,9 +851,9 @@ credential_validator.regexp = ^abc\\d+", []}, {raft_segment_max_entries, - "raft.segment_max_entries = 65536", + "raft.segment_max_entries = 32768", [{ra, [ - {segment_max_entries, 65536} + {segment_max_entries, 32768} ]}], []},