svn commit: r1134453 - in /hbase/branches/0.90: ./ src/main/java/org/apache/hadoop/hbase/master/ src/main/java/org/apache/hadoop/hbase/regionserver/ src/test/java/org/apache/hadoop/hbase/regionserver/

[st...@apache.org]

Author: stack
Date: Fri Jun 10 21:50:09 2011
New Revision: 1134453

URL: http://svn.apache.org/viewvc?rev=1134453&view=rev
Log:
HBASE-3892 Table can't disable 

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1134453&r1=1134452&r2=1134453&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Jun 10 21:50:09 2011
@@ -27,6 +27,7 @@ Release 0.90.4 - Unreleased
    HBASE-3723  Major compact should be done when there is only one storefile
                and some keyvalue is outdated (Zhou Shuaifeng)
    HBASE-3976  Disable block cache on compactions (Karthik Sankarachary)
+   HBASE-3892  Table can't disable (Gao Jinchao)
 
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1134453&r1=1134452&r2=1134453&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Fri Jun 10 21:50:09 2011
@@ -1851,6 +1851,15 @@ public class AssignmentManager extends Z
     } catch (KeeperException e) {
       LOG.warn("Exception while validating RIT during split report", e);
     }
+    synchronized (this.regions) {         
+      //one daughter is already online, do nothing
+      HServerInfo hsia = this.regions.get(a);
+      if (hsia != null){
+        LOG.warn("Trying to process the split of " +a.getEncodedName()+ ", " +
+          "but it was already done and one daughter is on region server " + hsia);
+        return;
+      }
+    }
 
     regionOnline(a, hsi);
     regionOnline(b, hsi);

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=1134453&r1=1134452&r2=1134453&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 Fri Jun 10 21:50:09 2011
@@ -736,6 +736,7 @@ public class HRegionServer implements HR
           // This will be caught and handled as a fatal error in run()
           throw ioe;
         }
+        LOG.warn("RemoteException connecting to master", ioe);
         // Couldn't connect to the master, get location from zk and reconnect
         // Method blocks until new master is found or we are stopped
         getMaster();

Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1134453&r1=1134452&r2=1134453&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Fri Jun 10 21:50:09 2011
@@ -172,6 +172,9 @@ public class TestSplitTransactionOnClust
       // Get daughters
       List<HRegion> daughters = cluster.getRegions(tableName);
       assertTrue(daughters.size() >= 2);
+      //Test repeating split message. HBASE-3892
+      server.reportSplit(hri, daughters.get(0).getRegionInfo(), daughters.get(1).getRegionInfo());
+      LOG.info("Repeating split message. HBASE-3892");      
       // Now split one of the daughters.
       regionCount = server.getOnlineRegions().size();
       split(daughters.get(0).getRegionInfo(), server, regionCount);