From bb5026c6a42912334bb08cc65e983e80ee49ba06 Mon Sep 17 00:00:00 2001 From: Matteo Bertozzi Date: Mon, 11 Jan 2016 09:37:08 -0800 Subject: [PATCH] HBASE-15052 Use EnvironmentEdgeManager in ReplicationSource --- .../hbase/replication/regionserver/ReplicationSource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index 804c6bb2641..342b826072b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -60,6 +60,7 @@ import org.apache.hadoop.hbase.replication.ReplicationQueues; import org.apache.hadoop.hbase.replication.SystemTableWALEntryFilter; import org.apache.hadoop.hbase.replication.WALEntryFilter; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.wal.DefaultWALProvider; @@ -640,7 +641,7 @@ public class ReplicationSource extends Thread sleepMultiplier = 1; // if there was nothing to ship and it's not an error // set "ageOfLastShippedOp" to to indicate that we're current - metrics.setAgeOfLastShippedOp(System.currentTimeMillis(), walGroupId); + metrics.setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(), walGroupId); } if (sleepForRetries("Nothing to replicate", sleepMultiplier)) { sleepMultiplier++;