Skip to content

Commit 65629bd

Browse files
committed
Renamning
1 parent a6df376 commit 65629bd

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,19 +2492,19 @@ end}.
24922492
%% Queue membership evaluation
24932493
%%
24942494

2495-
{mapping, "queue_membership_evaluation.enabled", "rabbit.member_eval_enabled", [
2495+
{mapping, "quorum_queue_membership_evaluation.enabled", "rabbit.quorum_membership_changes_enabled", [
24962496
{datatype, {enum, [true, false]}}]}.
24972497

24982498

2499-
{mapping, "queue_membership_evaluation.default_timeout", "rabbit.member_eval_default_timeout", [
2499+
{mapping, "quorum_queue_membership_evaluation.default_timeout", "rabbit.quorum_membership_changes_default_timeout", [
25002500
{datatype, integer}, {validators, ["non_negative_integer"]}
25012501
]}.
25022502

2503-
{mapping, "queue_membership_evaluation.short_timeout", "rabbit.member_eval_short_timeout", [
2503+
{mapping, "quorum_queue_membership_evaluation.short_timeout", "rabbit.quorum_membership_changes_short_timeout", [
25042504
{datatype, integer}, {validators, ["non_negative_integer"]}
25052505
]}.
25062506

2507-
{mapping, "queue_membership_evaluation.target_group_size", "rabbit.member_eval_target_group_size", [
2507+
{mapping, "quorum_queue_membership_evaluation.target_group_size", "rabbit.quorum_membership_changes_target_group_size", [
25082508
{datatype, integer}, {validators, ["non_negative_integer"]}
25092509
]}.
25102510

deps/rabbit/src/rabbit_queue_member_eval.erl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ on_node_down(_Node) ->
5454
%%----------------------------------------------------------------------------
5555

5656
init([]) ->
57-
DefaultInterval = rabbit_misc:get_env(rabbit, member_eval_default_timeout,
57+
DefaultInterval = rabbit_misc:get_env(rabbit, quorum_membership_changes_default_timeout,
5858
?DEFAULT_INTERVAL),
59-
ShortInterval = rabbit_misc:get_env(rabbit, member_eval_short_timeout,
59+
ShortInterval = rabbit_misc:get_env(rabbit, quorum_membership_changes_short_timeout,
6060
?SHORT_INTERVAL),
61-
TargetGroupSize = rabbit_misc:get_env(rabbit, member_eval_target_group_size,
61+
TargetGroupSize = rabbit_misc:get_env(rabbit, quorum_membership_changes_target_group_size,
6262
undefined),
63-
Enabled = rabbit_misc:get_env(rabbit, member_eval_enabled,
63+
Enabled = rabbit_misc:get_env(rabbit, quorum_membership_changes_enabled,
6464
false),
6565
State = #state{default_interval = DefaultInterval,
6666
short_interval = ShortInterval,
@@ -149,7 +149,7 @@ eval_quorum_members(ExpectedNodes, Running, [Q | LocalLeaders], TargetSize, OldR
149149
add_member(Q, Running, MemberNodes, TargetSize) ->
150150
%% Filter out any new nodes under maintenance
151151
New = rabbit_maintenance:filter_out_drained_nodes_local_read(Running -- MemberNodes),
152-
case should_add_node(MemberNodes, New, Q, TargetSize) of
152+
case should_add_node(MemberNodes, New, TargetSize) of
153153
true ->
154154
%% In the future, sort the list of new nodes based on load,
155155
%% availability zones etc
@@ -175,7 +175,7 @@ add_member(Q, Running, MemberNodes, TargetSize) ->
175175
noop
176176
end.
177177

178-
should_add_node(MemberNodes, New, Q, TargetSize) ->
178+
should_add_node(MemberNodes, New, TargetSize) ->
179179
CurrentSize = length(MemberNodes),
180180
maybe
181181
true ?= CurrentSize < TargetSize, %% Target size not reached

deps/rabbit/test/member_evaluation_SUITE.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ init_per_suite(Config0) ->
3535
rabbit_ct_helpers:log_environment(),
3636
Config1 = rabbit_ct_helpers:merge_app_env(
3737
Config0, {rabbit, [{quorum_tick_interval, 1000},
38-
{member_eval_enabled, true},
39-
{member_eval_default_timeout, 5000},
40-
{member_eval_short_timeout, 2000},
41-
{member_eval_target_group_size, 3}]}),
38+
{quorum_membership_changes_enabled, true},
39+
{quorum_membership_changes_default_timeout, 5000},
40+
{quorum_membership_changes_short_timeout, 2000},
41+
{quorum_membership_changes_target_group_size, 3}]}),
4242
rabbit_ct_helpers:run_setup_steps(Config1, []).
4343

4444
end_per_suite(Config) ->

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy