hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject hbase git commit: TestAssignmentManager.testBalanceOnMasterFailoverScenarioWithOfflineNode failing consistently on branch-1.1
Date Tue, 16 Jun 2015 22:06:55 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 a2085155f -> cf1ccc309


TestAssignmentManager.testBalanceOnMasterFailoverScenarioWithOfflineNode failing consistently
on branch-1.1


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cf1ccc30
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cf1ccc30
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cf1ccc30

Branch: refs/heads/branch-1.0
Commit: cf1ccc30909bfb04326415e5a648605759d57360
Parents: a208515
Author: Mikhail Antonov <antonov@apache.org>
Authored: Mon Jun 15 16:50:35 2015 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Tue Jun 16 15:02:06 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/cf1ccc30/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 65dc2ab..4d9eaeb 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
@@ -172,6 +172,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'.
@@ -1238,6 +1239,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


Mime
View raw message