You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/06/17 00:06:30 UTC
hbase git commit:
TestAssignmentManager.testBalanceOnMasterFailoverScenarioWithOfflineNode
failing consistently on branch-1.1
Repository: hbase
Updated Branches:
refs/heads/branch-1 d9827b3fb -> ec251bdd3
TestAssignmentManager.testBalanceOnMasterFailoverScenarioWithOfflineNode failing consistently on branch-1.1
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ec251bdd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec251bdd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec251bdd
Branch: refs/heads/branch-1
Commit: ec251bdd3649de7f30ece914c7930498e642527e
Parents: d9827b3
Author: Mikhail Antonov <an...@apache.org>
Authored: Mon Jun 15 16:50:35 2015 -0700
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Tue Jun 16 14:55:10 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/master/TestAssignmentManager.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ec251bdd/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
----------------------------------------------------------------------
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 79313b0..16ba50a 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
@@ -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