You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/10/03 22:32:07 UTC
hbase git commit: HBASE-14545 TestMasterFailover often times out
Repository: hbase
Updated Branches:
refs/heads/master a545d7129 -> c5a9895ad
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/c5a9895a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c5a9895a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c5a9895a
Branch: refs/heads/master
Commit: c5a9895ada8a7505fe3dfec7298edf85e9812ec5
Parents: a545d71
Author: stack <st...@apache.org>
Authored: Sat Oct 3 13:31:43 2015 -0700
Committer: stack <st...@apache.org>
Committed: Sat Oct 3 13:31:59 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/c5a9895a/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 c865360..9c292cc 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
@@ -145,7 +145,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/c5a9895a/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 df6dae5..f167847 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
@@ -161,10 +161,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);
}
/**