svn commit: r776451 - /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java

[st...@apache.org]

Author: stack
Date: Tue May 19 20:41:18 2009
New Revision: 776451

URL: http://svn.apache.org/viewvc?rev=776451&view=rev
Log:
HBASE-1440 master won't go down because joined on a rootscanner that is waiting for ever

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=776451&r1=776450&r2=776451&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java Tue May 19 20:41:18 2009
@@ -978,7 +978,8 @@
         // regionServerReport message from the HRegionServer that has been
         // allocated the ROOT region below.
         try {
-          rootRegionLocation.wait();
+          // Cycle rather than hold here in case master is closed meantime.
+          rootRegionLocation.wait(this.master.threadWakeFrequency);
         } catch (InterruptedException e) {
           // continue
         }
@@ -1350,4 +1351,4 @@
       return Bytes.compareTo(getRegionName(), o.getRegionName());
     }
   }
-}
\ No newline at end of file
+}