This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new 94a04fb Revert "HBASE-24446 Use EnvironmentEdgeManager to compute
clock skew in Master (#1835)"
94a04fb is described below
commit 94a04fb88ca2fd68b68c37698323937a54c794d3
Author: Viraj Jasani <[email protected]>
AuthorDate: Sun Jun 7 14:45:14 2020 +0530
Revert "HBASE-24446 Use EnvironmentEdgeManager to compute clock skew in
Master (#1835)"
This reverts commit 4853961b2c83369cba4aace9db20661ea979094d.
---
.../apache/hadoop/hbase/master/ServerManager.java | 3 +--
.../TestRegionServerReportForDuty.java | 29 ++--------------------
2 files changed, 3 insertions(+), 29 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
index 8f8759a..c889395 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
@@ -78,7 +78,6 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.RegionOpeningState;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.RetryCounter;
import org.apache.hadoop.hbase.util.RetryCounterFactory;
import org.apache.hadoop.hbase.util.Triple;
@@ -405,7 +404,7 @@ public class ServerManager {
*/
private void checkClockSkew(final ServerName serverName, final long
serverCurrentTime)
throws ClockOutOfSyncException {
- long skew = Math.abs(EnvironmentEdgeManager.currentTime() -
serverCurrentTime);
+ long skew = Math.abs(System.currentTimeMillis() - serverCurrentTime);
if (skew > maxSkew) {
String message = "Server " + serverName + " has been " +
"rejected; Reported time is too far out of sync with master. " +
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
index 89f7b7a..792843c 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
@@ -31,21 +31,20 @@ import org.apache.hadoop.hbase.CoordinatedStateManager;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.LocalHBaseCluster;
-import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
+import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.ServerManager;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
-import org.apache.hadoop.hbase.util.ManualEnvironmentEdge;
import org.apache.log4j.Appender;
import org.apache.log4j.Layout;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.WriterAppender;
import org.apache.zookeeper.KeeperException;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -214,30 +213,6 @@ public class TestRegionServerReportForDuty {
}
- /**
- * Tests region sever reportForDuty with manual environment edge
- */
- @Test(timeout = 60000)
- public void testReportForDutyWithEnvironmentEdge() throws Exception {
-
- // Start a master and wait for it to become the active/primary master.
- // Use a random unique port
- cluster.getConfiguration().setInt(HConstants.MASTER_PORT,
HBaseTestingUtility.randomFreePort());
-
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,
1);
-
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART,
1);
-
- // Inject manual environment edge for clock skew computation between RS
and master
- ManualEnvironmentEdge edge = new ManualEnvironmentEdge();
- EnvironmentEdgeManager.injectEdge(edge);
- master = cluster.addMaster();
- rs = cluster.addRegionServer();
- LOG.debug("Starting master: " + master.getMaster().getServerName());
- master.start();
- rs.start();
-
- waitForClusterOnline(master);
- }
-
private void waitForClusterOnline(MasterThread master) throws
InterruptedException {
while (true) {
if (master.getMaster().isInitialized()) {
