From 2f28ae86e4dcf936774dc872fb86df33de717488 Mon Sep 17 00:00:00 2001 From: martinsumner Date: Thu, 3 Nov 2016 12:31:00 +0000 Subject: [PATCH] Journal compaction test to cover deleted objects --- test/end_to_end/basic_SUITE.erl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/end_to_end/basic_SUITE.erl b/test/end_to_end/basic_SUITE.erl index 21bf066..d94db71 100644 --- a/test/end_to_end/basic_SUITE.erl +++ b/test/end_to_end/basic_SUITE.erl @@ -115,7 +115,7 @@ journal_compaction(_Config) -> {TestObject, TestSpec} = testutil:generate_testobject(), ok = leveled_bookie:book_riakput(Bookie1, TestObject, TestSpec), testutil:check_forobject(Bookie1, TestObject), - ObjList1 = testutil:generate_objects(5000, 2), + ObjList1 = testutil:generate_objects(20000, 2), lists:foreach(fun({_RN, Obj, Spc}) -> leveled_bookie:book_riakput(Bookie1, Obj, Spc) end, ObjList1), @@ -137,8 +137,18 @@ journal_compaction(_Config) -> testutil:check_forlist(Bookie1, ChkList1), testutil:check_forobject(Bookie1, TestObject), testutil:check_forobject(Bookie1, TestObject2), - %% Now replace all the objects - ObjList2 = testutil:generate_objects(50000, 2), + %% Delete some of the objects + ObjListD = testutil:generate_objects(10000, 2), + lists:foreach(fun({_R, O, _S}) -> + ok = leveled_bookie:book_riakdelete(Bookie1, + O#r_object.bucket, + O#r_object.key, + []) + end, + ObjListD), + + %% Now replace all the other objects + ObjList2 = testutil:generate_objects(40000, 10002), lists:foreach(fun({_RN, Obj, Spc}) -> leveled_bookie:book_riakput(Bookie1, Obj, Spc) end, ObjList2),