From 03a03d931c31d2d1470ba944c9faad10a85cdde8 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Wed, 19 Jul 2017 10:33:23 -0700 Subject: [PATCH] HBASE-18366 Fixed flaky test hbase.master.procedure.TestServerCrashProcedure#testRecoveryAndDoubleExecutionOnRsWithMeta Dead servers with default version 0.0.0 is filtered out in AssignmentManager.getExcludedServersForSystemTable() --- .../org/apache/hadoop/hbase/master/assignment/AssignmentManager.java | 2 +- .../apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java index cb2ecf10c232142c197744a07d4dce3d7a98af3e..1c56e15e0e2352a1a1df8338eab8db3f395c6c52 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java @@ -1762,7 +1762,7 @@ public class AssignmentManager implements ServerListener { * For system table, we must assign them to a server with highest version. */ public List getExcludedServersForSystemTable() { - List> serverList = master.getServerManager().getOnlineServersList() + List> serverList = master.getServerManager().createDestinationServersList() .stream() .map((s)->new Pair<>(s, master.getRegionServerVersion(s))) .collect(Collectors.toList()); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java index b6bf0bb15b7e6e1122af6cf415eb58a95f924340..ef13ff252e41015189684508e052976e7a1942b9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestServerCrashProcedure.java @@ -86,7 +86,6 @@ public class TestServerCrashProcedure { public void testCrashTargetRs() throws Exception { } - @Ignore // HBASE-18366... To be enabled again. @Test(timeout=60000) public void testRecoveryAndDoubleExecutionOnRsWithMeta() throws Exception { testRecoveryAndDoubleExecution(true); -- 2.10.1 (Apple Git-78)