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 2010/05/06 01:35:00 UTC

svn commit: r941546 - /hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java

Author: stack
Date: Wed May  5 23:34:59 2010
New Revision: 941546

URL: http://svn.apache.org/viewvc?rev=941546&view=rev
Log:
HBASE-2513 hbase-2414 added bug where we'd tight-loop if no root available

Modified:
    hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java?rev=941546&r1=941545&r2=941546&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperationQueue.java Wed May  5 23:34:59 2010
@@ -122,8 +122,8 @@ public class RegionServerOperationQueue 
     // it first.
     if (rootRegionLocation != null) {
       op = delayedToDoQueue.poll();
-    } else {
-    // if there aren't any todo items in the queue, sleep for a bit.
+    }
+    if (op == null) {
       try {
         op = toDoQueue.poll(threadWakeFrequency, TimeUnit.MILLISECONDS);
       } catch (InterruptedException e) {