You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2008/11/10 01:10:20 UTC
svn commit: r712586 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/master/HMaster.java
src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
Author: jdcryans
Date: Sun Nov 9 16:10:19 2008
New Revision: 712586
URL: http://svn.apache.org/viewvc?rev=712586&view=rev
Log:
HBASE-964 Startup stuck "waiting for root region"
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=712586&r1=712585&r2=712586&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Sun Nov 9 16:10:19 2008
@@ -104,6 +104,7 @@
HBASE-975 Improve MapFile performance for start and end key
HBASE-961 Delete multiple columns by regular expression
(Samuel Guo via Stack)
+ HBASE-964 Startup stuck "waiting for root region"
NEW FEATURES
HBASE-875 Use MurmurHash instead of JenkinsHash [in bloomfilters]
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=712586&r1=712585&r2=712586&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Sun Nov 9 16:10:19 2008
@@ -800,7 +800,7 @@
public HServerAddress findRootRegion() {
HServerAddress rootServer = null;
- if (regionManager.allRegionsAssigned()) {
+ if (regionManager.isInitialMetaScanComplete()) {
rootServer = regionManager.getRootRegionLocation();
}
return rootServer;
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java?rev=712586&r1=712585&r2=712586&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java Sun Nov 9 16:10:19 2008
@@ -87,9 +87,6 @@
// start the mini cluster
this.cluster = new MiniHBaseCluster(conf, regionServers);
// opening the META table ensures that cluster is running
- // We need to sleep because we cannot open a HTable when the cluster
- // is not ready
- Thread.sleep(5000);
new HTable(conf, HConstants.META_TABLE_NAME);
}