Replacing repl_util AAE wait with rt version

Author: engelsanchez

tests/repl_aae_fullsync.erl

@@ -91,8 +91,8 @@ simple_test() ->
     read_from_cluster(BFirst, 1, ?NUM_KEYS, ?NUM_KEYS),
 
     %% Wait for trees to compute.
-    repl_util:wait_until_aae_trees_built(ANodes),
-    repl_util:wait_until_aae_trees_built(BNodes),
+    rt:wait_until_aae_trees_built(ANodes),
+    rt:wait_until_aae_trees_built(BNodes),
 
     lager:info("Test fullsync from cluster A leader ~p to cluster B",
                [LeaderA]),
@@ -186,9 +186,9 @@ dual_test() ->
     rt:wait_until_ring_converged(ANodes),
 
     %% Wait for trees to compute.
-    repl_util:wait_until_aae_trees_built(ANodes),
-    repl_util:wait_until_aae_trees_built(BNodes),
-    repl_util:wait_until_aae_trees_built(CNodes),
+    rt:wait_until_aae_trees_built(ANodes),
+    rt:wait_until_aae_trees_built(BNodes),
+    rt:wait_until_aae_trees_built(CNodes),
 
     %% Flush AAE trees to disk.
     perform_sacrifice(AFirst),
@@ -278,7 +278,7 @@ bidirectional_test() ->
     perform_sacrifice(AFirst),
 
     %% Wait for trees to compute.
-    repl_util:wait_until_aae_trees_built(ANodes),
+    rt:wait_until_aae_trees_built(ANodes),
 
     %% Verify A replicated to B.
     validate_completed_fullsync(LeaderA, BFirst, "B", 1, ?NUM_KEYS),
@@ -291,7 +291,7 @@ bidirectional_test() ->
     perform_sacrifice(BFirst),
 
     %% Wait for trees to compute.
-    repl_util:wait_until_aae_trees_built(BNodes),
+    rt:wait_until_aae_trees_built(BNodes),
 
     %% Verify B replicated to A.
     validate_completed_fullsync(LeaderB, AFirst, "A", ?NUM_KEYS + 1, ?NUM_KEYS + ?NUM_KEYS),
@@ -350,8 +350,8 @@ difference_test() ->
                              [{timeout, 4000}]),
 
     %% Wait for trees to compute.
-    repl_util:wait_until_aae_trees_built(ANodes),
-    repl_util:wait_until_aae_trees_built(BNodes),
+    rt:wait_until_aae_trees_built(ANodes),
+    rt:wait_until_aae_trees_built(BNodes),
 
     lager:info("Test fullsync from cluster A leader ~p to cluster B",
                [LeaderA]),
@@ -436,8 +436,8 @@ deadlock_test() ->
     [ok = rt_intercept:add(Target, Intercept) || Target <- ANodes],
 
     %% Wait for trees to compute.
-    repl_util:wait_until_aae_trees_built(ANodes),
-    repl_util:wait_until_aae_trees_built(BNodes),
+    rt:wait_until_aae_trees_built(ANodes),
+    rt:wait_until_aae_trees_built(BNodes),
 
     lager:info("Test fullsync from cluster A leader ~p to cluster B",
                [LeaderA]),
@@ -579,7 +579,7 @@ validate_intercepted_fullsync(InterceptTarget,
     rt:wait_for_service(InterceptTarget, riak_repl),
 
     %% Wait until AAE trees are compueted on the rebooted node.
-    repl_util:wait_until_aae_trees_built([InterceptTarget]).
+    rt:wait_until_aae_trees_built([InterceptTarget]).
 
 %% @doc Given a node, find the port that the cluster manager is
 %%      listening on.

tests/repl_aae_fullsync_util.erl

@@ -77,8 +77,8 @@ prepare_cluster_data(TestBucket, NumKeysAOnly, _NumKeysBoth, [AFirst|_] = ANodes
     ?assertEqual(NumKeysAOnly, length(Res2)),
 
     %% wait for the AAE trees to be built so that we don't get a not_built error
-    repl_util:wait_until_aae_trees_built(ANodes),
-    repl_util:wait_until_aae_trees_built(BNodes),
+    rt:wait_until_aae_trees_built(ANodes),
+    rt:wait_until_aae_trees_built(BNodes),
 
     ok.
 

tests/repl_fs_bench.erl

@@ -122,27 +122,27 @@ fullsync_test(Strategy, Latency) ->
     ?assertEqual(ok, repl_util:wait_for_connection(LeaderA, "B")),
 
     %% Perform fullsync of an empty cluster.
-    repl_util:wait_until_aae_trees_built(ANodes ++ BNodes),
+    rt:wait_until_aae_trees_built(ANodes ++ BNodes),
     {EmptyTime, _} = timer:tc(repl_util,
                               start_and_wait_until_fullsync_complete,
                               [LeaderA]),
 
     %% Write keys and perform fullsync.
     repl_util:write_to_cluster(AFirst, 0, ?FULL_NUM_KEYS, ?TEST_BUCKET),
-    repl_util:wait_until_aae_trees_built(ANodes ++ BNodes),
+    rt:wait_until_aae_trees_built(ANodes ++ BNodes),
     {FullTime, _} = timer:tc(repl_util,
                              start_and_wait_until_fullsync_complete,
                              [LeaderA]),
 
     %% Rewrite first 10% keys and perform fullsync.
     repl_util:write_to_cluster(AFirst, 0, ?DIFF_NUM_KEYS, ?TEST_BUCKET),
-    repl_util:wait_until_aae_trees_built(ANodes ++ BNodes),
+    rt:wait_until_aae_trees_built(ANodes ++ BNodes),
     {DiffTime, _} = timer:tc(repl_util,
                              start_and_wait_until_fullsync_complete,
                              [LeaderA]),
 
     %% Write no keys, and perform the fullsync.
-    repl_util:wait_until_aae_trees_built(ANodes ++ BNodes),
+    rt:wait_until_aae_trees_built(ANodes ++ BNodes),
     {NoneTime, _} = timer:tc(repl_util,
                              start_and_wait_until_fullsync_complete,
                              [LeaderA]),

tests/repl_util.erl

@@ -12,7 +12,6 @@
          wait_until_leader_converge/1,
          wait_until_connection/1,
          wait_until_no_connection/1,
-         wait_until_aae_trees_built/1,
          wait_for_reads/5,
          start_and_wait_until_fullsync_complete/1,
          start_and_wait_until_fullsync_complete/2,
@@ -330,20 +329,6 @@ nodes_with_version(Nodes, Version) ->
 nodes_all_have_version(Nodes, Version) ->
     Nodes == nodes_with_version(Nodes, Version).
 
-%% AAE support
-wait_until_aae_trees_built(Cluster) ->
-    lager:info("Check if all trees built for nodes ~p", [Cluster]),
-    F = fun(Node) ->
-            Info = rpc:call(Node,
-                            riak_kv_entropy_info,
-                            compute_tree_info,
-                            []),
-            NotBuilt = [X || {_,undefined}=X <- Info],
-            NotBuilt == []
-    end,
-    [rt:wait_until(Node, F) || Node <- Cluster],
-    ok.
-
 %% Return the number of partitions in the cluster where Node is a member.
 num_partitions(Node) ->
     {ok, Ring} = rpc:call(Node, riak_core_ring_manager, get_raw_ring, []),