Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mas i1861 batch #1377

Merged
merged 2 commits into from
Jun 9, 2023
Merged

Mas i1861 batch #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90076c5
Improve reliability of test
martinsumner Jun 7, 2023
a9a3dae
Need to wait delay after last TS
martinsumner Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions tests/nextgenrepl_deletemodes.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@
-define(C_NVAL, 2).

-define(KEY_COUNT, 10000).
-define(LOOP_COUNT, 10).
-define(LOOP_COUNT, 4).

-define(SNK_WORKERS, 4).

-define(DELETE_WAIT, 8000).
%% This must be increased, otherwise tombstones may be reaped before their
%% presence can be checked in the test

-define(TOMB_PAUSE, 2).

-define(COMMMON_VAL_INIT, <<"CommonValueToWriteForAllObjects">>).
-define(COMMMON_VAL_MOD, <<"CommonValueToWriteForAllModifiedObjects">>).
Expand All @@ -50,9 +54,10 @@
{tictacaae_storeheads, true},
{tictacaae_rebuildwait, 4},
{tictacaae_rebuilddelay, 3600},
{tictacaae_exchangetick, 120 * 1000},
{tictacaae_exchangetick, 3600 * 1000}, % don't exchange during test
{tictacaae_rebuildtick, 3600000}, % don't tick for an hour!
{ttaaefs_maxresults, 128},
{tombstone_pause, ?TOMB_PAUSE},
{delete_mode, DeleteMode}
]}
]).
Expand Down Expand Up @@ -225,6 +230,8 @@ test_repl(Protocol, [ClusterA, ClusterB, ClusterC]) ->
{NodeB1, ?B_NVAL, cluster_c},
{NodeC1ip, NodeC1port, ?C_NVAL}),

lager:info(
"*** Re-write and re-delete after initial tombstones reaped ***"),
write_then_delete(NodeA1, NodeA2, NodeB1, NodeB2, NodeC1, NodeC2),
lager:info("Find all tombstones in cluster A"),
{ok, BKdhL1} = find_tombs(NodeA1, all, all),
Expand Down Expand Up @@ -257,6 +264,8 @@ test_repl(Protocol, [ClusterA, ClusterB, ClusterC]) ->
{ok, BKdhLC} = find_tombs(NodeC1, all, all),
?assertMatch(0, length(BKdhLC)),

lager:info(
"*** Re-re-write and re-re-delete after initial tombstones reaped ***"),
write_then_delete(NodeA1, NodeA2, NodeB1, NodeB2, NodeC1, NodeC2),
reap_from_cluster(NodeA1, {job, 1}),
lager:info("Immediate reap count ~w after fsm managed reap",
Expand Down Expand Up @@ -311,7 +320,7 @@ write_to_cluster(Node, Start, End, CommonValBin) ->
{ok, C} = riak:client_connect(Node),
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
Obj =
case CommonValBin of
new_obj ->
Expand Down Expand Up @@ -344,7 +353,7 @@ delete_from_cluster(Node, Start, End) ->
{ok, C} = riak:client_connect(Node),
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
try riak_client:delete(?TEST_BUCKET, Key, C) of
ok ->
Acc;
Expand All @@ -364,7 +373,7 @@ reap_from_cluster(Node, Start, End) ->
{ok, C} = riak:client_connect(Node),
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
try riak_client:reap(?TEST_BUCKET, Key, C) of
true ->
Acc;
Expand Down Expand Up @@ -414,14 +423,18 @@ read_from_cluster(Node, Start, End, CommonValBin, Errors) ->
{ok, C} = riak:client_connect(Node),
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
case riak_client:get(?TEST_BUCKET, Key, C) of
{ok, Obj} ->
ExpectedVal = <<N:32/integer, CommonValBin/binary>>,
case riak_object:get_value(Obj) of
ExpectedVal ->
case riak_object:get_values(Obj) of
[ExpectedVal] ->
Acc;
UnexpectedVal ->
Siblings when length(Siblings) > 1 ->
lager:info(
"Siblings for Key ~s:~n ~w", [Key, Obj]),
[{wrong_value, Key, siblings}|Acc];
[UnexpectedVal] ->
[{wrong_value, Key, UnexpectedVal}|Acc]
end;
{error, Error} ->
Expand Down Expand Up @@ -514,13 +527,18 @@ write_then_delete(NodeA1, NodeA2, NodeB1, NodeB2, NodeC1, NodeC2) ->
[NodeA2, 1, ?KEY_COUNT, ?COMMMON_VAL_INIT, undefined],
?KEY_COUNT,
?LOOP_COUNT),
lager:info(
"Waiting for delete wait before reading from delete_mode ~w cluster "
"as otherwise read may overlap with reap and prompt a repair",
[?DELETE_WAIT]),
timer:sleep(?DELETE_WAIT),
?KEY_COUNT =
wait_for_outcome(?MODULE,
read_from_cluster,
[NodeC2, 1, ?KEY_COUNT, ?COMMMON_VAL_INIT, undefined],
?KEY_COUNT,
?LOOP_COUNT),
lager:info("Write and delete cylcle confirmed").
lager:info("Write and delete cycle confirmed").


root_compare(
Expand Down
23 changes: 17 additions & 6 deletions tests/nextgenrepl_deletewithfailure.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

-define(KEY_COUNT, 10000).
-define(UPDATE_COUNT, 2000).
-define(LOOP_COUNT, 20).
-define(LOOP_COUNT, 16).
-define(ACTION_DELAY, 2000).

-define(SNK_WORKERS, 4).
Expand Down Expand Up @@ -159,6 +159,7 @@ test_repl(Protocol, [ClusterA, ClusterB]) ->
write_then_delete(NodeA1, NodeB1, ?KEY_COUNT + 1, ?KEY_COUNT * 2),
timer:sleep(?ACTION_DELAY),
SW1B = os:timestamp(),
timer:sleep(?ACTION_DELAY),

{ok, K0} = aae_fold(NodeA1,
Protocol,
Expand Down Expand Up @@ -266,7 +267,9 @@ test_repl(Protocol, [ClusterA, ClusterB]) ->
{EK0, 2} = lists:last(SKLA0),
[{SK1, 2}|_RestA1] = SKLA1,
{EK1, 2} = lists:last(SKLA1),
lager:info("Erasing partial delete siblings from Node"),
lager:info(
"Erasing partial delete siblings from Node ~p ~p - local",
[SK0, EK0]),
{ok, EraseCount0} =
aae_fold(NodeA1,
Protocol,
Expand All @@ -275,6 +278,9 @@ test_repl(Protocol, [ClusterA, ClusterB]) ->
all,
{ts_epoch(SW0A), ts_epoch(SW0B)},
local}),
lager:info(
"Erasing partial delete siblings from Node ~p ~p - job",
[SK1, EK1]),
{ok, EraseCount1} =
aae_fold(NodeA1,
Protocol,
Expand Down Expand Up @@ -319,8 +325,13 @@ test_repl(Protocol, [ClusterA, ClusterB]) ->
?TEST_BUCKET, all, all,
{ts_epoch(SW1A), ts_epoch(SW1B)},
local}),
lager:info("Reaped ~w tombs from first time range", [TombCount0]),
lager:info("Reaped ~w tombs from second time range", [TombCount1]),

ExpectedEC = EraseCount0 + EraseCount1,
lager:info(
"EraseCount0 ~w EraseCount1 ~w expected tombs ~w",
[EraseCount0, EraseCount1, ExpectedEC]),
{ok, ExpectedEC} =
wait_for_outcome(?MODULE,
aae_fold,
Expand Down Expand Up @@ -489,7 +500,7 @@ write_to_cluster(Node, Start, End, CommonValBin) ->
B = ?TEST_BUCKET,
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
Obj =
case CommonValBin of
new_obj ->
Expand Down Expand Up @@ -528,7 +539,7 @@ delete_from_cluster(Node, Start, End) ->
{ok, C} = riak:client_connect(Node),
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
try riak_client:delete(?TEST_BUCKET, Key, C) of
ok ->
Acc;
Expand All @@ -548,7 +559,7 @@ read_from_cluster(Node, Start, End, CommonValBin, Errors) ->
{ok, C} = riak:client_connect(Node),
F =
fun(N, Acc) ->
Key = list_to_binary(io_lib:format("~8..0B~n", [N])),
Key = list_to_binary(io_lib:format("~8..0B", [N])),
case riak_client:get(?TEST_BUCKET, Key, C) of
{ok, Obj} ->
ExpectedVal = <<N:32/integer, CommonValBin/binary>>,
Expand Down Expand Up @@ -619,7 +630,7 @@ write_then_delete(NodeA1, NodeB1, Start, End) ->
0,
?LOOP_COUNT),

lager:info("Deleting ~w objects from B and read not_found from A and C",
lager:info("Deleting ~w objects from B and read not_found from A",
[?KEY_COUNT]),
delete_from_cluster(NodeB1, Start, End),
lager:info("Waiting for missing sample"),
Expand Down