svn commit: r654653 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[jimk]

Author: jimk
Date: Thu May  8 16:41:47 2008
New Revision: 654653

URL: http://svn.apache.org/viewvc?rev=654653&view=rev
Log:
HBASE-614   Retiring regions is not used; exploit or remove

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=654653&r1=654652&r2=654653&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu May  8 16:41:47 2008
@@ -49,7 +49,8 @@
    HBASE-600   Filters have excessive DEBUG logging
    HBASE-611   regionserver should do basic health check before reporting
                alls-well to the master
-
+   HBASE-614   Retiring regions is not used; exploit or remove
+   
 Release 0.1.1 - 04/11/2008
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=654653&r1=654652&r2=654653&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
 Thu May  8 16:41:47 2008
@@ -190,33 +190,11 @@
   }
   
   /** [EMAIL PROTECTED] */
-  public void closing(final Text regionName) {
-    startTime = System.currentTimeMillis();
-    server.getWriteLock().lock();
-    try {
-      // Remove region from regions Map and add it to the Map of retiring
-      // regions.
-      server.setRegionClosing(regionName);
-      if (LOG.isDebugEnabled()) {
-        LOG.debug(regionName.toString() + " closing (" +
-          "Adding to retiringRegions)");
-      }
-    } finally {
-      server.getWriteLock().unlock();
-    }
+  public void closing(@SuppressWarnings("unused") final Text regionName) {
   }
   
   /** [EMAIL PROTECTED] */
-  public void closed(final Text regionName) {
-    server.getWriteLock().lock();
-    try {
-      server.setRegionClosed(regionName);
-      if (LOG.isDebugEnabled()) {
-        LOG.debug(regionName.toString() + " closed");
-      }
-    } finally {
-      server.getWriteLock().unlock();
-    }
+  public void closed(@SuppressWarnings("unused") final Text regionName) {
   }
 
   /**

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=654653&r1=654652&r2=654653&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Thu May  8 16:41:47 2008
@@ -115,8 +115,6 @@
   // region name -> HRegion
   protected volatile Map<Text, HRegion> onlineRegions =
     new ConcurrentHashMap<Text, HRegion>();
-  protected volatile Map<Text, HRegion> retiringRegions =
-    new ConcurrentHashMap<Text, HRegion>();
  
   protected final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
   private volatile List<HMsg> outboundMsgs =
@@ -1296,42 +1294,10 @@
    */
   protected HRegion getRegion(final Text regionName)
   throws NotServingRegionException {
-    return getRegion(regionName, false);
-  }
-  
-  /** Move a region from online to closing. */
-  void setRegionClosing(final Text regionName) {
-    retiringRegions.put(regionName, onlineRegions.remove(regionName));
-  }
-  
-  /** Set a region as closed. */
-  void setRegionClosed(final Text regionName) {
-    retiringRegions.remove(regionName);
-  }
-  
-  /** 
-   * Protected utility method for safely obtaining an HRegion handle.
-   * @param regionName Name of online [EMAIL PROTECTED] HRegion} to return
-   * @param checkRetiringRegions Set true if we're to check retiring regions
-   * as well as online regions.
-   * @return [EMAIL PROTECTED] HRegion} for <code>regionName</code>
-   * @throws NotServingRegionException
-   */
-  protected HRegion getRegion(final Text regionName,
-    final boolean checkRetiringRegions)
-  throws NotServingRegionException {
     HRegion region = null;
     this.lock.readLock().lock();
     try {
       region = onlineRegions.get(regionName);
-      if (region == null && checkRetiringRegions) {
-        region = this.retiringRegions.get(regionName);
-        if (LOG.isDebugEnabled()) {
-          if (region != null) {
-            LOG.debug("Found region " + regionName + " in retiringRegions");
-          }
-        }
-      }
 
       if (region == null) {
         throw new NotServingRegionException(regionName.toString());