hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-14545 TestMasterFailover often times out
Date Sat, 03 Oct 2015 20:34:01 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 a62116907 -> 91bb04091


HBASE-14545 TestMasterFailover often times out


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

Branch: refs/heads/branch-1.1
Commit: 91bb04091413b4bdc94d25ecb836180f607ddc4b
Parents: a621169
Author: stack <stack@apache.org>
Authored: Sat Oct 3 13:31:43 2015 -0700
Committer: stack <stack@apache.org>
Committed: Sat Oct 3 13:33:55 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 4 +++-
 .../main/java/org/apache/hadoop/hbase/master/RegionStates.java   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/91bb0409/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
index 364c257..7934a74 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
@@ -144,7 +144,9 @@ public class LocalHBaseCluster {
     // clash over default ports.
     conf.set(HConstants.MASTER_PORT, "0");
     conf.set(HConstants.REGIONSERVER_PORT, "0");
-    conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");
+    if (conf.getInt(HConstants.REGIONSERVER_INFO_PORT, 0) != -1) {
+      conf.set(HConstants.REGIONSERVER_INFO_PORT, "0");
+    }
 
     this.masterClass = (Class<? extends HMaster>)
       conf.getClass(HConstants.MASTER_IMPL, masterClass);

http://git-wip-us.apache.org/repos/asf/hbase/blob/91bb0409/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
index 78097ac..42583ff 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
@@ -168,10 +168,10 @@ public class RegionStates {
   }
 
   /**
-   * @return an unmodifiable the region assignment map
+   * @return a copy of the region assignment map
    */
   public synchronized Map<HRegionInfo, ServerName> getRegionAssignments() {
-    return Collections.unmodifiableMap(regionAssignments);
+    return new TreeMap<HRegionInfo, ServerName>(regionAssignments);
   }
 
   /**


Mime
View raw message