Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TestAssignmentManager.testBalanceOnMasterFailoverScenarioWithOfflineNode failing consistently on branch-1.1

Browse Source 
Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
This commit is contained in:
Mikhail Antonov 2015-06-15 16:50:35 -07:00 committed by Nick Dimiduk
parent d9827b3fb3
commit ec251bdd36
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
View File

@ -185,6 +185,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'.
@ -1344,6 +1345,7 @@ public class TestAssignmentManager {
ClusterConnection connection = (ClusterConnection)HConnectionTestingUtility.
getMockedConnectionAndDecorate(HTU.getConfiguration(), null,
ri, SERVERNAME_LIVE, 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