diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java index 609d216..50eb3b5 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java @@ -50,11 +50,11 @@ import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.util.StringUtils; import org.cliffc.high_scale_lib.Counter; - -import com.google.common.base.Preconditions; import org.cloudera.htrace.Trace; import org.cloudera.htrace.TraceScope; +import com.google.common.base.Preconditions; + /** * Thread that flushes cache on request * @@ -544,7 +544,7 @@ class MemStoreFlusher implements FlushRequester { if (Trace.isTracing()) { scope.getSpan().addTimelineAnnotation("Force Flush. We're above high water mark."); } - long start = System.currentTimeMillis(); + long start = EnvironmentEdgeManager.currentTimeMillis(); synchronized (this.blockSignal) { boolean blocked = false; long startTime = 0; @@ -566,7 +566,7 @@ class MemStoreFlusher implements FlushRequester { } catch (InterruptedException ie) { Thread.currentThread().interrupt(); } - long took = System.currentTimeMillis() - start; + long took = EnvironmentEdgeManager.currentTimeMillis() - start; LOG.warn("Memstore is above high water mark and block " + took + "ms"); } if(blocked){ @@ -674,7 +674,7 @@ class MemStoreFlusher implements FlushRequester { FlushRegionEntry(final HRegion r) { this.region = r; - this.createTime = System.currentTimeMillis(); + this.createTime = EnvironmentEdgeManager.currentTimeMillis(); this.whenToExpire = this.createTime; } @@ -683,7 +683,7 @@ class MemStoreFlusher implements FlushRequester { * @return True if we have been delayed > maximumWait milliseconds. */ public boolean isMaximumWait(final long maximumWait) { - return (System.currentTimeMillis() - this.createTime) > maximumWait; + return (EnvironmentEdgeManager.currentTimeMillis() - this.createTime) > maximumWait; } /** @@ -701,14 +701,14 @@ class MemStoreFlusher implements FlushRequester { * @return This. */ public FlushRegionEntry requeue(final long when) { - this.whenToExpire = System.currentTimeMillis() + when; + this.whenToExpire = EnvironmentEdgeManager.currentTimeMillis() + when; this.requeueCount++; return this; } @Override public long getDelay(TimeUnit unit) { - return unit.convert(this.whenToExpire - System.currentTimeMillis(), + return unit.convert(this.whenToExpire - EnvironmentEdgeManager.currentTimeMillis(), TimeUnit.MILLISECONDS); }