HBASE-9023 TestIOFencing.testFencingAroundCompactionAfterWALSync occasionally fails
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1514538 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
01bdee029a
commit
2b14f9db32
|
@ -1467,8 +1467,6 @@ public class HRegion implements HeapSize { // , Writable{
|
||||||
}
|
}
|
||||||
final long startTime = EnvironmentEdgeManager.currentTimeMillis();
|
final long startTime = EnvironmentEdgeManager.currentTimeMillis();
|
||||||
// Clear flush flag.
|
// Clear flush flag.
|
||||||
// Record latest flush time
|
|
||||||
this.lastFlushTime = startTime;
|
|
||||||
// If nothing to flush, return and avoid logging start/stop flush.
|
// If nothing to flush, return and avoid logging start/stop flush.
|
||||||
if (this.memstoreSize.get() <= 0) {
|
if (this.memstoreSize.get() <= 0) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -1598,6 +1596,9 @@ public class HRegion implements HeapSize { // , Writable{
|
||||||
wal.completeCacheFlush(this.getRegionInfo().getEncodedNameAsBytes());
|
wal.completeCacheFlush(this.getRegionInfo().getEncodedNameAsBytes());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Record latest flush time
|
||||||
|
this.lastFlushTime = EnvironmentEdgeManager.currentTimeMillis();
|
||||||
|
|
||||||
// Update the last flushed sequence id for region
|
// Update the last flushed sequence id for region
|
||||||
if (this.rsServices != null) {
|
if (this.rsServices != null) {
|
||||||
completeSequenceId = flushSeqId;
|
completeSequenceId = flushSeqId;
|
||||||
|
|
Loading…
Reference in New Issue