Merge branch 'master' into mas-i164-hotbackup

2018-09-07 12:27:30 +01:00 · 2018-09-07 12:27:30 +01:00 · b99cde9599
commit b99cde9599
parent 9a8ce88ed2 faec45ad8e
9 changed files with 574 additions and 104 deletions
--- a/test/end_to_end/recovery_SUITE.erl
+++ b/test/end_to_end/recovery_SUITE.erl
@ -174,11 +174,12 @@ aae_missingjournal(_Config) ->
        fun(B, K, _V, Acc) -> [{B, K}|Acc] end,
    
    {async, AllHeadF1} =
-        leveled_bookie:book_returnfolder(Bookie1,
-                                            {foldheads_allkeys,
-                                                ?RIAK_TAG,
-                                                FoldHeadsFun,
-                                                true, true, false}),
+        leveled_bookie:book_headfold(Bookie1,
+                                     ?RIAK_TAG,
+                                     {FoldHeadsFun, []},
+                                     true,
+                                     true,
+                                     false),
    HeadL1 = length(AllHeadF1()),
    io:format("Fold head returned ~w objects~n", [HeadL1]),