hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1230902 - in /hbase/branches/0.90: ./ src/main/java/org/apache/hadoop/hbase/regionserver/ src/main/java/org/apache/hadoop/hbase/regionserver/handler/
Date Fri, 13 Jan 2012 05:25:00 GMT
Author: tedyu
Date: Fri Jan 13 05:24:59 2012
New Revision: 1230902

URL: http://svn.apache.org/viewvc?rev=1230902&view=rev
Log:
Back out HBASE-5157 to see if 0.90 can build - Ram does not have access in office

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1230902&r1=1230901&r2=1230902&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Jan 13 05:24:59 2012
@@ -155,8 +155,6 @@ Release 0.90.5 - Dec 22, 2011
                internal invocations of other hbase scripts
    HBASE-5156  Backport HBASE-4899 - Region would be assigned twice easily with 
                continually killing server and moving region in testing environment(Ram)
-   HBASE-5157  Backport HBASE-4880- Region is on service before openRegionHandler 
-               completes, may cause data loss (Ram)
    HBASE-5158  Backport HBASE-4878 - Master crash when splitting hlog may cause data loss
(Ram)
    HBASE-5168  Backport HBASE-5100 - Rollback of split could cause closed region to be opened
again(Ram)
    HBASE-5178  Backport HBASE-4101 - Regionserver Deadlock (Ram)

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=1230902&r1=1230901&r2=1230902&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 Jan 13 05:24:59 2012
@@ -1365,6 +1365,9 @@ public class HRegionServer implements HR
           "Region has too many store files");
     }
 
+    // Add to online regions if all above was successful.
+    addToOnlineRegions(r);
+
     // Update ZK, ROOT or META
     if (r.getRegionInfo().isRootRegion()) {
       RootLocationEditor.setRootLocation(getZooKeeper(),

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1230902&r1=1230901&r2=1230902&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Fri Jan 13 05:24:59 2012
@@ -311,8 +311,6 @@ class SplitTransaction {
       throw new IOException("Failed " +
         bOpener.getName(), bOpener.getException());
     }
-    services.addToOnlineRegions(a);
-    services.addToOnlineRegions(b);
 
     // Leaving here, the splitdir with its dross will be in place but since the
     // split was successful, just leave it; it'll be cleaned when parent is

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java?rev=1230902&r1=1230901&r2=1230902&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
Fri Jan 13 05:24:59 2012
@@ -117,9 +117,6 @@ public class OpenRegionHandler extends E
         cleanupFailedOpen(region);
         return;
       }
-      
-      // Add to online regions if all above was successful.
-      this.rsServices.addToOnlineRegions(region);
 
       // Done!  Successful region open
       LOG.debug("Opened " + name);
@@ -299,6 +296,7 @@ public class OpenRegionHandler extends E
 
   private void cleanupFailedOpen(final HRegion region) throws IOException {
     if (region != null) region.close();
+    this.rsServices.removeFromOnlineRegions(regionInfo.getEncodedName());
   }
 
   /**



Mime
View raw message