Author: stack
Date: Mon Nov 29 22:29:28 2010
New Revision: 1040326
URL: http://svn.apache.org/viewvc?rev=1040326&view=rev
Log:
HBASE-3265 Regionservers waiting for ROOT while Master waiting for RegionServers
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1040326&r1=1040325&r2=1040326&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Mon Nov 29 22:29:28 2010
@@ -707,6 +707,7 @@ Release 0.90.0 - Unreleased
previously expired RS instances to rejoin cluster
HBASE-3283 NPE in AssignmentManager if processing shutdown of RS who
doesn't have any regions assigned to it
+ HBASE-3265 Regionservers waiting for ROOT while Master waiting for
RegionServers
IMPROVEMENTS
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1040326&r1=1040325&r2=1040326&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Mon Nov 29 22:29:28 2010
@@ -550,8 +550,6 @@ public class HRegionServer implements HR
this.stopping = true;
}
}
- // Try to get the root region location from zookeeper.
- this.catalogTracker.waitForRoot();
long now = System.currentTimeMillis();
// Drop into the send loop if msgInterval has elapsed or if something
// to send. If we fail talking to the master, then we'll sleep below
