svn commit: r1514550 - /hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[te...@apache.org]

Author: tedyu
Date: Fri Aug 16 01:14:41 2013
New Revision: 1514550

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


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

Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1514550&r1=1514549&r2=1514550&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Fri Aug 16 01:14:41 2013
@@ -1484,8 +1484,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;
@@ -1615,6 +1613,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;