svn commit: r1514538 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[te...@apache.org]

Author: tedyu
Date: Thu Aug 15 23:19:23 2013
New Revision: 1514538

URL: http://svn.apache.org/r1514538
Log:
HBASE-9023 TestIOFencing.testFencingAroundCompactionAfterWALSync occasionally fails


Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1514538&r1=1514537&r2=1514538&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Aug 15 23:19:23 2013
@@ -1467,8 +1467,6 @@ public class HRegion implements HeapSize
     }
     final long startTime = EnvironmentEdgeManager.currentTimeMillis();
     // Clear flush flag.
-    // Record latest flush time
-    this.lastFlushTime = startTime;
     // If nothing to flush, return and avoid logging start/stop flush.
     if (this.memstoreSize.get() <= 0) {
       return false;
@@ -1598,6 +1596,9 @@ public class HRegion implements HeapSize
       wal.completeCacheFlush(this.getRegionInfo().getEncodedNameAsBytes());
     }
 
+    // Record latest flush time
+    this.lastFlushTime = EnvironmentEdgeManager.currentTimeMillis();
+    
     // Update the last flushed sequence id for region
     if (this.rsServices != null) {
       completeSequenceId = flushSeqId;