svn commit: r662865 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[ji...@apache.org]

Author: jimk
Date: Tue Jun  3 12:27:30 2008
New Revision: 662865

URL: http://svn.apache.org/viewvc?rev=662865&view=rev
Log:
HBASE-663   Incorrect sequence number for cache flush

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

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=662865&r1=662864&r2=662865&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jun  3 12:27:30 2008
@@ -35,7 +35,8 @@
    HBASE-650   Add String versions of get, scanner, put in HTable
    HBASE-656   Do not retry exceptions such as unknown scanner or illegal argument
    HBASE-659   HLog#cacheFlushLock not cleared; hangs a region
-
+   HBASE-663   Incorrect sequence number for cache flush
+   
   IMPROVEMENTS
    HBASE-559   MR example job to count table rows
    HBASE-596   DemoClient.py (Ivan Begtin via Stack)

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=662865&r1=662864&r2=662865&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Jun  3 12:27:30 2008
@@ -980,15 +980,16 @@
     // to do this for a moment.  Its quick.  The subsequent sequence id that
     // goes into the HLog after we've flushed all these snapshots also goes
     // into the info file that sits beside the flushed files.
+    long sequenceId = -1L;
     this.updatesLock.writeLock().lock();
     try {
       for (HStore s: stores.values()) {
         s.snapshot();
       }
+      sequenceId = log.startCacheFlush();
     } finally {
       this.updatesLock.writeLock().unlock();
     }
-    long sequenceId = log.startCacheFlush();
 
     // Any failure from here on out will be catastrophic requiring server
     // restart so hlog content can be replayed and put back into the memcache.