hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mberto...@apache.org
Subject [1/6] hbase git commit: HBASE-15052 Use EnvironmentEdgeManager in ReplicationSource
Date Mon, 11 Jan 2016 18:02:00 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 1f23667a8 -> 43fb23527
  refs/heads/branch-1 f541539da -> bb5026c6a
  refs/heads/branch-1.0 cccf8e6a4 -> f4fa859d9
  refs/heads/branch-1.1 96da13c04 -> 893dff8bd
  refs/heads/branch-1.2 8a36c2bff -> 4b59f62c2
  refs/heads/master 894ce84b8 -> ec47a811a


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/ec47a811
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec47a811
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec47a811

Branch: refs/heads/master
Commit: ec47a811a2e7c0bb3f844d780049bb8a67cc4c35
Parents: 894ce84
Author: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Authored: Mon Jan 11 09:37:08 2016 -0800
Committer: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Committed: Mon Jan 11 09:37:08 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/ec47a811/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 868ddee..b4975bf 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 <now> to indicate that we're current
-            metrics.setAgeOfLastShippedOp(System.currentTimeMillis(), walGroupId);
+            metrics.setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(), walGroupId);
           }
           if (sleepForRetries("Nothing to replicate", sleepMultiplier)) {
             sleepMultiplier++;


Mime
View raw message