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 wa...@apache.org on 2016/04/18 14:32:03 UTC
hadoop git commit: HDFS-10275. TestDataNodeMetrics failing
intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin
Yiqun.
Repository: hadoop
Updated Branches:
refs/heads/trunk 67523ffcf -> ab903029a
HDFS-10275. TestDataNodeMetrics failing intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin Yiqun.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab903029
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab903029
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab903029
Branch: refs/heads/trunk
Commit: ab903029a9d353677184ff5602966b11ffb408b9
Parents: 67523ff
Author: Walter Su <wa...@apache.org>
Authored: Mon Apr 18 20:29:29 2016 +0800
Committer: Walter Su <wa...@apache.org>
Committed: Mon Apr 18 20:29:29 2016 +0800
----------------------------------------------------------------------
.../hadoop/hdfs/server/datanode/TestDataNodeMetrics.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab903029/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
index 5f9b602..355f7a1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
@@ -258,10 +258,9 @@ public class TestDataNodeMetrics {
* and reading causes totalReadTime to move.
* @throws Exception
*/
- @Test(timeout=60000)
+ @Test(timeout=120000)
public void testDataNodeTimeSpend() throws Exception {
Configuration conf = new HdfsConfiguration();
- SimulatedFSDataset.setFactory(conf);
MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
try {
final FileSystem fs = cluster.getFileSystem();
@@ -284,6 +283,7 @@ public class TestDataNodeMetrics {
DFSTestUtil.createFile(fs, new Path("/time.txt." + x.get()),
LONG_FILE_LEN, (short) 1, Time.monotonicNow());
DFSTestUtil.readFile(fs, new Path("/time.txt." + x.get()));
+ fs.delete(new Path("/time.txt." + x.get()), true);
} catch (IOException ioe) {
LOG.error("Caught IOException while ingesting DN metrics", ioe);
return false;
@@ -294,7 +294,7 @@ public class TestDataNodeMetrics {
return endWriteValue > startWriteValue
&& endReadValue > startReadValue;
}
- }, 30, 30000);
+ }, 30, 60000);
} finally {
if (cluster != null) {
cluster.shutdown();