From e9a4a9075497da3cbc9099c4f0066de3c1a46102 Mon Sep 17 00:00:00 2001 From: Mikhail Antonov Date: Mon, 15 Jun 2015 16:50:35 -0700 Subject: [PATCH] TestAssignmentManager.testBalanceOnMasterFailoverScenarioWithOfflineNode failing consistently on branch-1.1 --- .../test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java index 9e8097e..42bfeb3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java @@ -173,6 +173,7 @@ public class TestAssignmentManager { // Make it so we can get a catalogtracker from servermanager.. .needed // down in guts of server shutdown handler. Mockito.when(server.getConnection()).thenReturn(connection); + Mockito.when(connection.isManaged()).thenReturn(true); // Mock a ServerManager. Say server SERVERNAME_{A,B} are online. Also // make it so if close or open, we return 'success'. @@ -1241,6 +1242,7 @@ public class TestAssignmentManager { ClusterConnection connection = (ClusterConnection)HConnectionTestingUtility. getMockedConnectionAndDecorate(HTU.getConfiguration(), null, ri, SERVERNAME_B, REGIONINFO); + Mockito.when(this.server.getConnection()).thenReturn(connection); // These mocks were done up when all connections were managed. World is different now we // moved to unmanaged connections. It messes up the intercepts done in these tests. // Just mark connections as marked and then down in MetaTableAccessor, it will go the path -- 2.3.2 (Apple Git-55)