Renamning

Author: SimonUnge

deps/rabbit/priv/schema/rabbit.schema

@@ -2492,19 +2492,19 @@ end}.
 %% Queue membership evaluation
 %%
 
-{mapping, "queue_membership_evaluation.enabled", "rabbit.member_eval_enabled", [
+{mapping, "quorum_queue_membership_evaluation.enabled", "rabbit.quorum_membership_changes_enabled", [
     {datatype, {enum, [true, false]}}]}.
 
 
-{mapping, "queue_membership_evaluation.default_timeout", "rabbit.member_eval_default_timeout", [
+{mapping, "quorum_queue_membership_evaluation.default_timeout", "rabbit.quorum_membership_changes_default_timeout", [
     {datatype, integer}, {validators, ["non_negative_integer"]}
 ]}.
 
-{mapping, "queue_membership_evaluation.short_timeout", "rabbit.member_eval_short_timeout", [
+{mapping, "quorum_queue_membership_evaluation.short_timeout", "rabbit.quorum_membership_changes_short_timeout", [
     {datatype, integer}, {validators, ["non_negative_integer"]}
 ]}.
 
-{mapping, "queue_membership_evaluation.target_group_size", "rabbit.member_eval_target_group_size", [
+{mapping, "quorum_queue_membership_evaluation.target_group_size", "rabbit.quorum_membership_changes_target_group_size", [
     {datatype, integer}, {validators, ["non_negative_integer"]}
 ]}.
 

deps/rabbit/src/rabbit_queue_member_eval.erl

@@ -54,13 +54,13 @@ on_node_down(_Node) ->
 %%----------------------------------------------------------------------------
 
 init([]) ->
-    DefaultInterval = rabbit_misc:get_env(rabbit, member_eval_default_timeout,
+    DefaultInterval = rabbit_misc:get_env(rabbit, quorum_membership_changes_default_timeout,
                                           ?DEFAULT_INTERVAL),
-    ShortInterval = rabbit_misc:get_env(rabbit, member_eval_short_timeout,
+    ShortInterval = rabbit_misc:get_env(rabbit, quorum_membership_changes_short_timeout,
                                         ?SHORT_INTERVAL),
-    TargetGroupSize = rabbit_misc:get_env(rabbit, member_eval_target_group_size,
+    TargetGroupSize = rabbit_misc:get_env(rabbit, quorum_membership_changes_target_group_size,
                                           undefined),
-    Enabled = rabbit_misc:get_env(rabbit, member_eval_enabled,
+    Enabled = rabbit_misc:get_env(rabbit, quorum_membership_changes_enabled,
                                   false),
     State = #state{default_interval = DefaultInterval,
                    short_interval = ShortInterval,
@@ -149,7 +149,7 @@ eval_quorum_members(ExpectedNodes, Running, [Q | LocalLeaders], TargetSize, OldR
 add_member(Q, Running, MemberNodes, TargetSize) ->
     %% Filter out any new nodes under maintenance
     New = rabbit_maintenance:filter_out_drained_nodes_local_read(Running -- MemberNodes),
-    case should_add_node(MemberNodes, New, Q, TargetSize) of
+    case should_add_node(MemberNodes, New, TargetSize) of
         true ->
             %% In the future, sort the list of new nodes based on load,
             %% availability zones etc
@@ -175,7 +175,7 @@ add_member(Q, Running, MemberNodes, TargetSize) ->
             noop
     end.
 
-should_add_node(MemberNodes, New, Q, TargetSize) ->
+should_add_node(MemberNodes, New, TargetSize) ->
     CurrentSize = length(MemberNodes),
     maybe
         true ?= CurrentSize < TargetSize, %% Target size not reached

deps/rabbit/test/member_evaluation_SUITE.erl

@@ -35,10 +35,10 @@ init_per_suite(Config0) ->
     rabbit_ct_helpers:log_environment(),
     Config1 = rabbit_ct_helpers:merge_app_env(
                 Config0, {rabbit, [{quorum_tick_interval, 1000},
-                                   {member_eval_enabled, true},
-                                   {member_eval_default_timeout, 5000},
-                                   {member_eval_short_timeout, 2000},
-                                   {member_eval_target_group_size, 3}]}),
+                                   {quorum_membership_changes_enabled, true},
+                                   {quorum_membership_changes_default_timeout, 5000},
+                                   {quorum_membership_changes_short_timeout, 2000},
+                                   {quorum_membership_changes_target_group_size, 3}]}),
     rabbit_ct_helpers:run_setup_steps(Config1, []).
 
 end_per_suite(Config) ->