From f005c579a6f5257d3d8af7cb016a7f28f6327077 Mon Sep 17 00:00:00 2001
From: Simon Unge <simunge@amazon.com>
Date: Tue, 13 Jun 2023 17:52:36 +0000
Subject: [PATCH] Test updated

---
 deps/rabbit/src/rabbit_queue_member_eval.erl | 10 +++++++---
 deps/rabbit/test/member_evaluation_SUITE.erl |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/deps/rabbit/src/rabbit_queue_member_eval.erl b/deps/rabbit/src/rabbit_queue_member_eval.erl
index 511093af7ed7..78f385a8201a 100644
--- a/deps/rabbit/src/rabbit_queue_member_eval.erl
+++ b/deps/rabbit/src/rabbit_queue_member_eval.erl
@@ -29,7 +29,8 @@
 -record(state, {timer_ref :: reference() | undefined,
                 default_interval :: non_neg_integer(),
                 short_interval :: non_neg_integer(),
-                target_group_size :: non_neg_integer() | undefined}).
+                target_group_size :: non_neg_integer() | undefined,
+                enabled :: boolean()}).
 
 %%----------------------------------------------------------------------------
 %% Start
@@ -63,7 +64,8 @@ init([]) ->
                                   false),
     State = #state{default_interval = DefaultInterval,
                    short_interval = ShortInterval,
-                   target_group_size = TargetGroupSize},
+                   target_group_size = TargetGroupSize,
+                   enabled = Enabled},
     case Enabled of
         true ->
             Ref = erlang:send_after(DefaultInterval, self(), ?EVAL_MSG),
@@ -75,7 +77,7 @@ init([]) ->
 handle_call(_Request, _From, State) ->
     {reply, ok, State}.
 
-handle_cast(nodechange, #state{timer_ref = undefined} = State) ->
+handle_cast(nodechange, #state{enabled = false} = State) ->
     {noreply, State, hibernate};
 handle_cast(nodechange, #state{timer_ref = OldRef,
                                short_interval = Time} = State) ->
@@ -97,6 +99,8 @@ handle_info(?EVAL_MSG, #state{default_interval = DefaultInterval,
                  end,
     Ref = erlang:send_after(NewTimeout, self(), ?EVAL_MSG),
     {noreply, State#state{timer_ref = Ref}};
+handle_info(_Info, #state{enabled = false} = State) ->
+    {noreply, State, hibernate};
 handle_info(_Info, State) ->
     {noreply, State}.
 
diff --git a/deps/rabbit/test/member_evaluation_SUITE.erl b/deps/rabbit/test/member_evaluation_SUITE.erl
index 5cc897b9f3e1..665c354d2b0f 100644
--- a/deps/rabbit/test/member_evaluation_SUITE.erl
+++ b/deps/rabbit/test/member_evaluation_SUITE.erl
@@ -35,6 +35,7 @@ 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}]}),