HBASE-15052 Use EnvironmentEdgeManager in ReplicationSource
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f4fa859d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f4fa859d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f4fa859d Branch: refs/heads/branch-1.0 Commit: f4fa859d949f4cffbb5bf8ed17a64bd6c58ce586 Parents: cccf8e6 Author: Matteo Bertozzi <[email protected]> Authored: Mon Jan 11 09:49:26 2016 -0800 Committer: Matteo Bertozzi <[email protected]> Committed: Mon Jan 11 09:49:47 2016 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/replication/regionserver/ReplicationSource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f4fa859d/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java ---------------------------------------------------------------------- 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 0d55b94..f3734b2 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 @@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.replication.ReplicationQueueInfo; 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.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; @@ -395,7 +396,7 @@ public class ReplicationSource extends Thread sleepMultiplier = 1; // if there was nothing to ship and it's not an error // set "ageOfLastShippedOp" to <now> to indicate that we're current - this.metrics.setAgeOfLastShippedOp(System.currentTimeMillis()); + this.metrics.setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime()); } if (sleepForRetries("Nothing to replicate", sleepMultiplier)) { sleepMultiplier++;
