You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by li...@apache.org on 2016/09/28 03:42:29 UTC
hadoop git commit: HDFS-10915. Fix time measurement bug in
TestDatanodeRestart. Contributed by Xiaobing Zhou
Repository: hadoop
Updated Branches:
refs/heads/trunk 9c9736463 -> 6437ba18c
HDFS-10915. Fix time measurement bug in TestDatanodeRestart. Contributed by Xiaobing Zhou
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6437ba18
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6437ba18
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6437ba18
Branch: refs/heads/trunk
Commit: 6437ba18c5c26bc271a63aff5ea03756f43dd9a3
Parents: 9c97364
Author: Mingliang Liu <li...@apache.org>
Authored: Tue Sep 27 20:40:17 2016 -0700
Committer: Mingliang Liu <li...@apache.org>
Committed: Tue Sep 27 20:40:17 2016 -0700
----------------------------------------------------------------------
.../datanode/fsdataset/impl/TestDatanodeRestart.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6437ba18/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestDatanodeRestart.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestDatanodeRestart.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestDatanodeRestart.java
index 40a3d9d..0afee5f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestDatanodeRestart.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestDatanodeRestart.java
@@ -45,6 +45,7 @@ import org.apache.hadoop.hdfs.server.datanode.ReplicaInfo;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsVolumeSpi;
import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.util.Time;
import org.junit.Assert;
import org.junit.Test;
@@ -172,17 +173,17 @@ public class TestDatanodeRestart {
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(numDNs).build();
cluster.waitActive();
- start = System.currentTimeMillis();
+ start = Time.monotonicNow();
FileSystem fileSys = cluster.getFileSystem();
try {
DFSTestUtil.createFile(fileSys, file, 10240L, (short)1, 0L);
// It is a bug if this does not fail.
throw new IOException("Did not fail!");
} catch (org.apache.hadoop.ipc.RemoteException e) {
- long elapsed = System.currentTimeMillis() - start;
+ long elapsed = Time.monotonicNow() - start;
// timers have at-least semantics, so it should be at least 5 seconds.
if (elapsed < 5000 || elapsed > 10000) {
- throw new IOException(elapsed + " seconds passed.", e);
+ throw new IOException(elapsed + " milliseconds passed.", e);
}
}
DataNodeFaultInjector.set(oldDnInjector);
@@ -195,18 +196,18 @@ public class TestDatanodeRestart {
// back to simulating unregistered node.
DataNodeFaultInjector.set(dnFaultInjector);
byte[] buffer = new byte[8];
- start = System.currentTimeMillis();
+ start = Time.monotonicNow();
try {
fileSys.open(file).read(0L, buffer, 0, 1);
throw new IOException("Did not fail!");
} catch (IOException e) {
- long elapsed = System.currentTimeMillis() - start;
+ long elapsed = Time.monotonicNow() - start;
if (e.getMessage().contains("readBlockLength")) {
throw new IOException("Failed, but with unexpected exception:", e);
}
// timers have at-least semantics, so it should be at least 5 seconds.
if (elapsed < 5000 || elapsed > 10000) {
- throw new IOException(elapsed + " seconds passed.", e);
+ throw new IOException(elapsed + " milliseconds passed.", e);
}
}
DataNodeFaultInjector.set(oldDnInjector);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org