Repository: hbase Updated Branches: refs/heads/master 6fc71c5d3 -> f3b3a7c9b
HBASE-16080 Fix flakey test TestTableBasedReplicationSourceManager.cleanupFailoverQueues(). Instead of running the primary test in a separate thread and hoping it finishes in time, just run the test in the primary thread. Signed-off-by: Elliott Clark <ecl...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f3b3a7c9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f3b3a7c9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f3b3a7c9 Branch: refs/heads/master Commit: f3b3a7c9b5c5e28545fb47dc501d6bfc6a4e1cfe Parents: 6fc71c5 Author: Joseph Hwang <j...@fb.com> Authored: Wed Jun 22 08:55:41 2016 -0700 Committer: Elliott Clark <ecl...@apache.org> Committed: Wed Jun 22 12:26:35 2016 -0700 ---------------------------------------------------------------------- .../replication/regionserver/TestReplicationSourceManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f3b3a7c9/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java index 4b278bb..f60982e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java @@ -345,8 +345,7 @@ public abstract class TestReplicationSourceManager { NodeFailoverWorker w1 = manager.new NodeFailoverWorker(server.getServerName().getServerName(), rq1, rp1, new UUID( new Long(1), new Long(2))); - w1.start(); - w1.join(10000); + w1.run(); assertEquals(1, manager.getWalsByIdRecoveredQueues().size()); String id = "1-" + server.getServerName().getServerName(); assertEquals(files, manager.getWalsByIdRecoveredQueues().get(id).get(group));