svn commit: r792744 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[nitay]

Author: nitay
Date: Thu Jul  9 23:04:42 2009
New Revision: 792744

URL: http://svn.apache.org/viewvc?rev=792744&view=rev
Log:
HBASE-1629 HRS unable to contact master

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=792744&r1=792743&r2=792744&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Jul  9 23:04:42 2009
@@ -249,6 +249,7 @@
                (Jon Gray via Stack)
    HBASE-1625  Adding check to Put.add(KeyValue kv), to see that it has the 
same
                row as when instantiated (Erik Holstad via Stack)
+   HBASE-1629  HRS unable to contact master
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=792744&r1=792743&r2=792744&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Thu Jul  9 23:04:42 2009
@@ -1327,7 +1327,7 @@
    * Run initialization using parameters passed us by the master.
    */
   private MapWritable reportForDuty() {
-    while (!getMaster()) {
+    while (!stopRequested.get() && !getMaster()) {
       sleeper.sleep();
       LOG.warn("Unable to get master for initialization");
     }