You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/08/30 02:30:22 UTC
[5/5] git commit: HBASE-11822 Convert
EnvironmentEdge#getCurrentTimeMillis to getCurrentTime
HBASE-11822 Convert EnvironmentEdge#getCurrentTimeMillis to getCurrentTime
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1834196f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1834196f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1834196f
Branch: refs/heads/branch-1
Commit: 1834196fcb8d3ddcd6bd87c678a34cc7f2cb3162
Parents: 7ac9cbb
Author: stack <st...@apache.org>
Authored: Fri Aug 29 17:30:02 2014 -0700
Committer: stack <st...@apache.org>
Committed: Fri Aug 29 17:30:02 2014 -0700
----------------------------------------------------------------------
.../hbase/coordination/ZkRegionMergeCoordination.java | 4 ++--
.../apache/hadoop/hbase/regionserver/SplitLogWorker.java | 10 +++++-----
.../apache/hadoop/hbase/master/TestAssignmentManager.java | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1834196f/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZkRegionMergeCoordination.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZkRegionMergeCoordination.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZkRegionMergeCoordination.java
index 8c18821..1ab5d9e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZkRegionMergeCoordination.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZkRegionMergeCoordination.java
@@ -225,7 +225,7 @@ public class ZkRegionMergeCoordination implements RegionMergeCoordination {
transitionMergingNode(mergedRegionInfo, region_a.getRegionInfo(), region_b.getRegionInfo(),
manager.getServer().getServerName(), rmd, RS_ZK_REGION_MERGING, RS_ZK_REGION_MERGED);
- long startTime = EnvironmentEdgeManager.currentTimeMillis();
+ long startTime = EnvironmentEdgeManager.currentTime();
int spins = 0;
// Now wait for the master to process the merge. We know it's done
// when the znode is deleted. The reason we keep tickling the znode is
@@ -234,7 +234,7 @@ public class ZkRegionMergeCoordination implements RegionMergeCoordination {
if (spins % 10 == 0) {
LOG.debug("Still waiting on the master to process the merge for "
+ mergedRegionInfo.getEncodedName() + ", waited "
- + (EnvironmentEdgeManager.currentTimeMillis() - startTime) + "ms");
+ + (EnvironmentEdgeManager.currentTime() - startTime) + "ms");
}
Thread.sleep(100);
// When this returns -1 it means the znode doesn't exist
http://git-wip-us.apache.org/repos/asf/hbase/blob/1834196f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
index 6ade099..cd401bd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitLogWorker.java
@@ -151,8 +151,8 @@ public class SplitLogWorker extends ZooKeeperListener implements Runnable {
return Status.RESIGNED;
} catch (IOException e) {
Throwable cause = e.getCause();
- if (e instanceof RetriesExhaustedException && (cause instanceof NotServingRegionException
- || cause instanceof ConnectException
+ if (e instanceof RetriesExhaustedException && (cause instanceof NotServingRegionException
+ || cause instanceof ConnectException
|| cause instanceof SocketTimeoutException)) {
LOG.warn("log replaying of " + filename + " can't connect to the target regionserver, "
+ "resigning", e);
@@ -454,7 +454,7 @@ public class SplitLogWorker extends ZooKeeperListener implements Runnable {
@Override
public boolean progress() {
- long t = EnvironmentEdgeManager.currentTimeMillis();
+ long t = EnvironmentEdgeManager.currentTime();
if ((t - last_report_at) > reportPeriod) {
last_report_at = t;
int latestZKVersion = attemptToOwnTask(false, watcher, serverName, curTask, mode,
@@ -468,8 +468,8 @@ public class SplitLogWorker extends ZooKeeperListener implements Runnable {
return true;
}
};
-
- HLogSplitterHandler hsh = new HLogSplitterHandler(this.server, curTask, zkVersion, reporter,
+
+ HLogSplitterHandler hsh = new HLogSplitterHandler(this.server, curTask, zkVersion, reporter,
this.tasksInProgress, this.splitTaskExecutor, mode);
this.executorService.submit(hsh);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/1834196f/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
index 4a3d4f2..852ded2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
@@ -1410,10 +1410,10 @@ public class TestAssignmentManager {
ZKAssign.createNodeOffline(this.watcher, hri, SERVERNAME_A);
// Trigger a transition event
ZKAssign.transitionNodeOpening(this.watcher, hri, SERVERNAME_A);
- long startTime = EnvironmentEdgeManager.currentTimeMillis();
+ long startTime = EnvironmentEdgeManager.currentTime();
while (!zkEventProcessed.get()) {
assertTrue("Timed out in waiting for ZK event to be processed",
- EnvironmentEdgeManager.currentTimeMillis() - startTime < 30000);
+ EnvironmentEdgeManager.currentTime() - startTime < 30000);
Threads.sleepWithoutInterrupt(100);
}
assertFalse(am.getRegionStates().isRegionInTransition(hri));