svn commit: r1245676 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java

[stack]

Author: stack
Date: Fri Feb 17 17:30:15 2012
New Revision: 1245676

URL: http://svn.apache.org/viewvc?rev=1245676&view=rev
Log:
HBASE-5425 Punt on the timeout doesn't work in BulkEnabler#waitUntilDone 
(master's EnableTableHandler)

Modified:
    hbase/branches/0.92/CHANGES.txt
    
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1245676&r1=1245675&r2=1245676&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Feb 17 17:30:15 2012
@@ -20,6 +20,8 @@ Release 0.92.1 - Unreleased
    HBASE-5363  Automatically run rat check on mvn release builds
    HBASE-5398  HBase shell disable_all/enable_all/drop_all promp wrong tables
                for confirmation (Jimmy Xiang)
+   HBASE-5425  Punt on the timeout doesn't work in BulkEnabler#waitUntilDone
+               (master's EnableTableHandler)  (Terry Zhang)
 
   IMPROVEMENTS
    HBASE-5197  [replication] Handle socket timeouts in ReplicationSource

Modified: 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java?rev=1245676&r1=1245675&r2=1245676&view=diff
==============================================================================
--- 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
 (original)
+++ 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
 Fri Feb 17 17:30:15 2012
@@ -187,7 +187,7 @@ public class EnableTableHandler extends 
       long startTime = System.currentTimeMillis();
       long remaining = timeout;
       List<HRegionInfo> regions = null;
-      int lastNumberOfRegions = this.countOfRegionsInTable;
+      int lastNumberOfRegions = 0;
       while (!server.isStopped() && remaining > 0) {
         Thread.sleep(waitingTimeForEvents);
         regions = assignmentManager.getRegionsOfTable(tableName);