Journal compaction test to cover deleted objects

This commit is contained in:
martinsumner 2016-11-03 12:31:00 +00:00
parent a752074148
commit 2f28ae86e4

View file

@ -115,7 +115,7 @@ journal_compaction(_Config) ->
{TestObject, TestSpec} = testutil:generate_testobject(), {TestObject, TestSpec} = testutil:generate_testobject(),
ok = leveled_bookie:book_riakput(Bookie1, TestObject, TestSpec), ok = leveled_bookie:book_riakput(Bookie1, TestObject, TestSpec),
testutil:check_forobject(Bookie1, TestObject), testutil:check_forobject(Bookie1, TestObject),
ObjList1 = testutil:generate_objects(5000, 2), ObjList1 = testutil:generate_objects(20000, 2),
lists:foreach(fun({_RN, Obj, Spc}) -> lists:foreach(fun({_RN, Obj, Spc}) ->
leveled_bookie:book_riakput(Bookie1, Obj, Spc) end, leveled_bookie:book_riakput(Bookie1, Obj, Spc) end,
ObjList1), ObjList1),
@ -137,8 +137,18 @@ journal_compaction(_Config) ->
testutil:check_forlist(Bookie1, ChkList1), testutil:check_forlist(Bookie1, ChkList1),
testutil:check_forobject(Bookie1, TestObject), testutil:check_forobject(Bookie1, TestObject),
testutil:check_forobject(Bookie1, TestObject2), testutil:check_forobject(Bookie1, TestObject2),
%% Now replace all the objects %% Delete some of the objects
ObjList2 = testutil:generate_objects(50000, 2), 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}) -> lists:foreach(fun({_RN, Obj, Spc}) ->
leveled_bookie:book_riakput(Bookie1, Obj, Spc) end, leveled_bookie:book_riakput(Bookie1, Obj, Spc) end,
ObjList2), ObjList2),