hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/2] hbase git commit: HBASE-13330 Compilation issue fixed after cherry-pick
Date Fri, 16 Oct 2015 21:25:23 GMT
HBASE-13330 Compilation issue fixed after cherry-pick


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

Branch: refs/heads/branch-1.0
Commit: 779e404f4b4e051fa76e50379ec046052ed68b34
Parents: 7732bb9
Author: Devaraj Das <ddas@apache.org>
Authored: Fri Oct 16 14:25:11 2015 -0700
Committer: Devaraj Das <ddas@apache.org>
Committed: Fri Oct 16 14:25:11 2015 -0700

----------------------------------------------------------------------
 .../hbase/master/TestAssignmentManager.java     | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/779e404f/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 da2112d..3fd1741 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
@@ -883,15 +883,15 @@ public class TestAssignmentManager {
 
   /*
    * Tests the scenario
-   * - a regionserver (SERVERNAME_DEAD) owns a region (hence the meta would have
-   *   the SERVERNAME_DEAD as the host for the region),
-   * - SERVERNAME_DEAD goes down
-   * - one of the affected regions is assigned to a live regionserver (SERVERNAME_LIVE) but
that
+   * - a regionserver (SERVERNAME_A) owns a region (hence the meta would have
+   *   the SERVERNAME_A as the host for the region),
+   * - SERVERNAME_A goes down
+   * - one of the affected regions is assigned to a live regionserver (SERVERNAME_B) but
that
    *   assignment somehow fails. The region ends up in the FAILED_OPEN state on ZK
    * - [Issue that the patch on HBASE-13330 fixes] when the master is restarted,
-   *   the SSH for SERVERNAME_DEAD rightly thinks that the region is now on transition on
-   *   SERVERNAME_LIVE. But the owner for the region is still SERVERNAME_DEAD in the AM's
states.
-   *   The AM thinks that the SSH for SERVERNAME_DEAD will assign the region. The region
remains
+   *   the SSH for SERVERNAME_A rightly thinks that the region is now on transition on
+   *   SERVERNAME_B. But the owner for the region is still SERVERNAME_A in the AM's states.
+   *   The AM thinks that the SSH for SERVERNAME_A will assign the region. The region remains
    *   unassigned for ever.
    */
   @Test(timeout = 60000)
@@ -899,18 +899,18 @@ public class TestAssignmentManager {
   KeeperException, ServiceException, CoordinatedStateException, InterruptedException {
     AssignmentManagerWithExtrasForTesting am = setUpMockedAssignmentManager(
         this.server, this.serverManager);
-    ZKAssign.createNodeOffline(this.watcher, REGIONINFO, SERVERNAME_LIVE);
+    ZKAssign.createNodeOffline(this.watcher, REGIONINFO, SERVERNAME_B);
     int v = ZKAssign.getVersion(this.watcher, REGIONINFO);
-    ZKAssign.transitionNode(this.watcher, REGIONINFO, SERVERNAME_LIVE,
+    ZKAssign.transitionNode(this.watcher, REGIONINFO, SERVERNAME_B,
         EventType.M_ZK_REGION_OFFLINE, EventType.RS_ZK_REGION_FAILED_OPEN, v);
-    Mockito.when(this.serverManager.isServerOnline(SERVERNAME_LIVE)).thenReturn(true);
-    Mockito.when(this.serverManager.isServerReachable(SERVERNAME_LIVE)).thenReturn(true);
-    Mockito.when(this.serverManager.isServerOnline(SERVERNAME_DEAD)).thenReturn(false);
+    Mockito.when(this.serverManager.isServerOnline(SERVERNAME_B)).thenReturn(true);
+    Mockito.when(this.serverManager.isServerReachable(SERVERNAME_B)).thenReturn(true);
+    Mockito.when(this.serverManager.isServerOnline(SERVERNAME_A)).thenReturn(false);
     DeadServer deadServers = new DeadServer();
-    deadServers.add(SERVERNAME_DEAD);
+    deadServers.add(SERVERNAME_A);
     Mockito.when(this.serverManager.getDeadServers()).thenReturn(deadServers);
     final Map<ServerName, ServerLoad> onlineServers = new HashMap<ServerName, ServerLoad>();
-    onlineServers.put(SERVERNAME_LIVE, ServerLoad.EMPTY_SERVERLOAD);
+    onlineServers.put(SERVERNAME_B, ServerLoad.EMPTY_SERVERLOAD);
     Mockito.when(this.serverManager.getOnlineServersList()).thenReturn(
         new ArrayList<ServerName>(onlineServers.keySet()));
     Mockito.when(this.serverManager.getOnlineServers()).thenReturn(onlineServers);


Mime
View raw message