hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raw...@apache.org
Subject svn commit: r1079001 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Date Mon, 07 Mar 2011 22:37:54 GMT
Author: rawson
Date: Mon Mar  7 22:37:53 2011
New Revision: 1079001

URL: http://svn.apache.org/viewvc?rev=1079001&view=rev
Log:
HBASE-3608  MemstoreFlusher error message doesnt include exception

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1079001&r1=1079000&r2=1079001&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Mar  7 22:37:53 2011
@@ -139,6 +139,7 @@ Release 0.90.2 - Unreleased
    HBASE-3594  Rest server fails because of missing asm jar
    HBASE-3582  Allow HMaster and HRegionServer to login from keytab
                when on secure Hadoop
+   HBASE-3608  MemstoreFlusher error message doesnt include exception!
 
   IMPROVEMENTS
    HBASE-3542  MultiGet methods in Thrift

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1079001&r1=1079000&r2=1079001&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Mon
Mar  7 22:37:53 2011
@@ -141,7 +141,7 @@ class MemStoreFlusher extends Thread imp
     }
     return (long)(max * limit);
   }
-  
+
   /**
    * The memstore across all regions has exceeded the low water mark. Pick
    * one region to flush and flush it synchronously (this is called from the
@@ -169,7 +169,7 @@ class MemStoreFlusher extends Thread imp
         LOG.fatal("Above memory mark but there are no flushable regions!");
         return false;
       }
-      
+
       HRegion regionToFlush;
       if (bestAnyRegion.memstoreSize.get() > 2 * bestFlushableRegion.memstoreSize.get())
{
         // Even if it's not supposed to be flushed, pick a region if it's more than twice
@@ -187,9 +187,9 @@ class MemStoreFlusher extends Thread imp
       } else {
         regionToFlush = bestFlushableRegion;
       }
-      
+
       Preconditions.checkState(regionToFlush.memstoreSize.get() > 0);
-      
+
       LOG.info("Flush of region " + regionToFlush + " due to global heap pressure");
       flushedOne = flushRegion(regionToFlush, true);
       if (!flushedOne) {
@@ -226,7 +226,7 @@ class MemStoreFlusher extends Thread imp
               }
             }
             // Enqueue another one of these tokens so we'll wake up again
-            wakeupFlushThread();            
+            wakeupFlushThread();
           }
           continue;
         }
@@ -239,7 +239,7 @@ class MemStoreFlusher extends Thread imp
       } catch (ConcurrentModificationException ex) {
         continue;
       } catch (Exception ex) {
-        LOG.error("Cache flusher failed for entry " + fqe);
+        LOG.error("Cache flusher failed for entry " + fqe, ex);
         if (!server.checkFileSystem()) {
           break;
         }
@@ -282,14 +282,14 @@ class MemStoreFlusher extends Thread imp
     }
     return null;
   }
-  
+
   /**
    * Return true if global memory usage is above the high watermark
    */
   private boolean isAboveHighWaterMark() {
     return server.getGlobalMemStoreSize() >= globalMemStoreLimit;
   }
-  
+
   /**
    * Return true if we're above the high watermark
    */
@@ -329,7 +329,7 @@ class MemStoreFlusher extends Thread imp
    * A flushRegion that checks store file count.  If too many, puts the flush
    * on delay queue to retry later.
    * @param fqe
-   * @return true if the region was successfully flushed, false otherwise. If 
+   * @return true if the region was successfully flushed, false otherwise. If
    * false, there will be accompanying log messages explaining why the log was
    * not flushed.
    */
@@ -447,7 +447,7 @@ class MemStoreFlusher extends Thread imp
   }
 
   interface FlushQueueEntry extends Delayed {}
-  
+
   /**
    * Token to insert into the flush queue that ensures that the flusher does not sleep
    */
@@ -462,7 +462,7 @@ class MemStoreFlusher extends Thread imp
       return -1;
     }
   }
-  
+
   /**
    * Datastructure used in the flush queue.  Holds region and retry count.
    * Keeps tabs on how old this object is.  Implements {@link Delayed}.  On
@@ -473,7 +473,7 @@ class MemStoreFlusher extends Thread imp
    */
   static class FlushRegionEntry implements FlushQueueEntry {
     private final HRegion region;
-    
+
     private final long createTime;
     private long whenToExpire;
     private int requeueCount = 0;
@@ -499,7 +499,7 @@ class MemStoreFlusher extends Thread imp
     public int getRequeueCount() {
       return this.requeueCount;
     }
- 
+
     /**
      * @param when When to expire, when to come up out of the queue.
      * Specify in milliseconds.  This method adds System.currentTimeMillis()
@@ -523,7 +523,7 @@ class MemStoreFlusher extends Thread imp
       return Long.valueOf(getDelay(TimeUnit.MILLISECONDS) -
         other.getDelay(TimeUnit.MILLISECONDS)).intValue();
     }
-    
+
     @Override
     public String toString() {
       return "[flush region " + Bytes.toString(region.getRegionName()) + "]";



Mime
View raw message