|
|
@@ -47,6 +47,12 @@ opts(Config, Overrides) ->
|
|
|
Overrides
|
|
|
).
|
|
|
|
|
|
+appspec(ra) ->
|
|
|
+ {ra, #{
|
|
|
+ %% NOTE: Recover quicker in case the node sending a snapshot goes down or crash.
|
|
|
+ %% TODO: Probably need to have those tighter timeouts as defaults.
|
|
|
+ override_env => [{receive_snapshot_timeout, 5_000}]
|
|
|
+ }};
|
|
|
appspec(emqx_durable_storage) ->
|
|
|
{emqx_durable_storage, #{
|
|
|
before_start => fun snabbkaffe:fix_ct_logging/0,
|
|
|
@@ -102,7 +108,7 @@ t_metadata(_Config) ->
|
|
|
end.
|
|
|
|
|
|
t_replication_transfers_snapshots(init, Config) ->
|
|
|
- Apps = [appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
+ Apps = [appspec(ra), appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
NodeSpecs = emqx_cth_cluster:mk_nodespecs(
|
|
|
[
|
|
|
{t_replication_transfers_snapshots1, #{apps => Apps}},
|
|
|
@@ -173,7 +179,7 @@ t_replication_transfers_snapshots(Config) ->
|
|
|
).
|
|
|
|
|
|
t_rebalance(init, Config) ->
|
|
|
- Apps = [appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
+ Apps = [appspec(ra), appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
Nodes = emqx_cth_cluster:start(
|
|
|
[
|
|
|
{t_rebalance1, #{apps => Apps}},
|
|
|
@@ -380,7 +386,7 @@ t_join_leave_errors(Config) ->
|
|
|
).
|
|
|
|
|
|
t_rebalance_chaotic_converges(init, Config) ->
|
|
|
- Apps = [appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
+ Apps = [appspec(ra), appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
Nodes = emqx_cth_cluster:start(
|
|
|
[
|
|
|
{t_rebalance_chaotic_converges1, #{apps => Apps}},
|
|
|
@@ -794,7 +800,7 @@ t_store_batch_fail(Config) ->
|
|
|
).
|
|
|
|
|
|
t_crash_restart_recover(init, Config) ->
|
|
|
- Apps = [appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
+ Apps = [appspec(ra), appspec(emqx_durable_storage), appspec(emqx_ds_builtin_raft)],
|
|
|
Specs = emqx_cth_cluster:mk_nodespecs(
|
|
|
[
|
|
|
{t_crash_stop_recover1, #{apps => Apps}},
|