From 78f0c10a49131cde94655b44966994fd1981b4e2 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Wed, 30 Nov 2022 03:19:37 +0200 Subject: [PATCH 1/2] add missing function clause repair_keys_range in convert_fold, to unbreak aae_fold for that case --- src/riak_kv_clusteraae_fsm.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/riak_kv_clusteraae_fsm.erl b/src/riak_kv_clusteraae_fsm.erl index b586b2daf..d1f45d8ec 100644 --- a/src/riak_kv_clusteraae_fsm.erl +++ b/src/riak_kv_clusteraae_fsm.erl @@ -891,6 +891,8 @@ convert_fold({find_tombs, B, KR, SF, MR}) -> {find_tombs, B, KR, SF, convert_modrange(MR)}; convert_fold({reap_tombs, B, KR, SF, MR, CM}) -> {reap_tombs, B, KR, SF, convert_modrange(MR), CM}; +convert_fold({repair_keys_range, B, KR, MR, L}) -> + {repair_keys_range, B, KR, convert_modrange(MR), L}; convert_fold({erase_keys, B, KR, SF, MR, CM}) -> {erase_keys, B, KR, SF, convert_modrange(MR), CM}; convert_fold(Fold) -> From e11fcc2eff1daddcabd658f7a8bc479d8c593786 Mon Sep 17 00:00:00 2001 From: Andrei Zavada Date: Thu, 1 Dec 2022 14:57:05 +0200 Subject: [PATCH 2/2] thread converted aae_fold query in riak_client, to complete prev commit --- src/riak_client.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/riak_client.erl b/src/riak_client.erl index c01ebf906..7c18dd9bf 100644 --- a/src/riak_client.erl +++ b/src/riak_client.erl @@ -907,7 +907,7 @@ aae_fold(Query, {?MODULE, [Node, _ClientId]}) -> true -> riak_kv_clusteraae_fsm_sup:start_clusteraae_fsm(Node, [{raw, ReqId, Me}, - [Query, TimeOut]]), + [Q0, TimeOut]]), wait_for_fold_results(ReqId, TimeOut); false -> {error, "Invalid AAE fold definition"}