From 1e7f150f1fdaf15822e22dd5a13d25b94e9d159f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien.pedron@dumbbell.fr>
Date: Tue, 28 Jan 2025 16:59:45 +0100
Subject: [PATCH] Update Ra from 2.15.0 to 2.16.0

Release notes:
https://github.com/rabbitmq/ra/releases/tag/v2.16.0

One important change is rabbitmq/ra#493: it delays the machine version
upgrade until all members are up-to-date. This ensures that a Khepri
cluster member doesn't become stuck because it is running an older
version compared to the cluster leader.

V2: Adapt `cluster_SUITE` to a new behavior in Ra.
(cherry picked from commit 99ebba6843fc38fbf1544b03e2eafcb36e3f8055)
---
 rebar.config           |  2 +-
 rebar.lock             | 12 ++++++------
 test/cluster_SUITE.erl |  6 ++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/rebar.config b/rebar.config
index 3bf851fa..a6d5a72f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,7 @@
 %% vim:ft=erlang:
 {minimum_otp_vsn, "26.0"}.
 
-{deps, [{ra, "2.15.0"},
+{deps, [{ra, "2.16.0"},
         {horus, "0.3.1"}]}.
 
 {project_plugins, [rebar3_proper,
diff --git a/rebar.lock b/rebar.lock
index c48aae2d..fa9d7756 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,20 +1,20 @@
 {"1.2.0",
 [{<<"aten">>,{pkg,<<"aten">>,<<"0.6.0">>},1},
- {<<"gen_batch_server">>,{pkg,<<"gen_batch_server">>,<<"0.8.8">>},1},
+ {<<"gen_batch_server">>,{pkg,<<"gen_batch_server">>,<<"0.8.9">>},1},
  {<<"horus">>,{pkg,<<"horus">>,<<"0.3.1">>},0},
- {<<"ra">>,{pkg,<<"ra">>,<<"2.15.0">>},0},
+ {<<"ra">>,{pkg,<<"ra">>,<<"2.16.0">>},0},
  {<<"seshat">>,{pkg,<<"seshat">>,<<"0.6.0">>},1}]}.
 [
 {pkg_hash,[
  {<<"aten">>, <<"7A57B275A6DAF515AC3683FB9853E280B4D0DCDD74292FD66AC4A01C8694F8C7">>},
- {<<"gen_batch_server">>, <<"7840A1FA63EE1EFFC83E8A91D22664847A2BA1192D30EAFFFD914ACB51578068">>},
+ {<<"gen_batch_server">>, <<"1C6BC0F530BF8C17E8B4ACC20C2CC369FFA5BEE2B46DE01E21410745F24B1BC9">>},
  {<<"horus">>, <<"A5274C96E15924C28413752617B06050E4B08C04628B88209AFF9EA076F2BCB5">>},
- {<<"ra">>, <<"23D77CE1D4A8F69271467A847BA989815D1DAFC4F0762527F566E61D240E1EE2">>},
+ {<<"ra">>, <<"E3E63AD1359B97E027DBD77ED2DAAFCCD881F19200416E6F0AFB2F725CCC84CF">>},
  {<<"seshat">>, <<"3172EB1D7A2A4F66108CD6933A4E465AFF80F84AA90ED83F047B92F636123CCD">>}]},
 {pkg_hash_ext,[
  {<<"aten">>, <<"5F39A164206AE3F211EF5880B1F7819415686436E3229D30B6A058564FBAA168">>},
- {<<"gen_batch_server">>, <<"C3E6A1A2A0FB62AEE631A98CFA0FD8903E9562422CBF72043953E2FB1D203017">>},
+ {<<"gen_batch_server">>, <<"C8581FE4A4B6BCCF91E53CE6A8C7E6C27C8C591BAB5408B160166463F5579C22">>},
  {<<"horus">>, <<"D564D30EBC274F0D92C3D44A336D0B892F000BE159912AE4E6838701E85495EC">>},
- {<<"ra">>, <<"CFC0DBE5EBBD54F44081F95EA6A1DAEB28A89DF82AA9BAA234F68ABBB36BDC67">>},
+ {<<"ra">>, <<"7CDF7894F1F542AEAA3D9E6F3209AAB6EFE9A1CDD1D81DE9587C3EA23629B0E3">>},
  {<<"seshat">>, <<"7CEF700F92831DD7CAE6A6DD223CCC55AC88ECCE0631EE9AB0F2B5FB70E79B90">>}]}
 ].
diff --git a/test/cluster_SUITE.erl b/test/cluster_SUITE.erl
index 49bdb056..d7bfa498 100644
--- a/test/cluster_SUITE.erl
+++ b/test/cluster_SUITE.erl
@@ -441,9 +441,15 @@ fail_to_start_with_bad_ra_server_config(Config) ->
               _},
              _}} ->
                true;
+           {error,
+            {{bad_action_from_state_function,
+               {{timeout, tick}, not_a_timeout, tick_timeout}},
+             _}} ->
+               true;
            {error, noproc} ->
                true;
            _ ->
+               ct:pal("Unexpected return value:~n~p", [Ret]),
                false
        end),