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/03/29 20:55:13 UTC
hadoop git commit: HDFS-10197. TestFsDatasetCache failing
intermittently due to timeout. Contributed by Lin Yiqun.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 7b2cf29f4 -> 1d79b57c1
HDFS-10197. TestFsDatasetCache failing intermittently due to timeout. Contributed by Lin Yiqun.
(cherry picked from commit f2aec4eb824647a01e14b4eede03af0babe65fb6)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d79b57c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d79b57c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d79b57c
Branch: refs/heads/branch-2
Commit: 1d79b57c14410417b1ecccabfe2c695a1c6cd6a2
Parents: 7b2cf29
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Mar 29 11:54:42 2016 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue Mar 29 11:54:52 2016 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java | 2 +-
.../apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d79b57c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
index 6ecd14e..95665d7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
@@ -1462,7 +1462,7 @@ public class DFSTestUtil {
NativeIO.POSIX.getCacheManipulator().getMemlockLimit());
return true;
}
- }, 100, 60000);
+ }, 100, 120000);
return expectedCacheUsed;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d79b57c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java
index 77b0c44..d82e383 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java
@@ -88,6 +88,8 @@ import org.apache.log4j.LogManager;
import com.google.common.base.Supplier;
import com.google.common.primitives.Ints;
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_FSDATASETCACHE_MAX_THREADS_PER_VOLUME_KEY;
+
public class TestFsDatasetCache {
private static final Log LOG = LogFactory.getLog(TestFsDatasetCache.class);
@@ -124,6 +126,7 @@ public class TestFsDatasetCache {
conf.setLong(DFSConfigKeys.DFS_DATANODE_MAX_LOCKED_MEMORY_KEY,
CACHE_CAPACITY);
conf.setLong(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1);
+ conf.setInt(DFS_DATANODE_FSDATASETCACHE_MAX_THREADS_PER_VOLUME_KEY, 10);
prevCacheManipulator = NativeIO.POSIX.getCacheManipulator();
NativeIO.POSIX.setCacheManipulator(new NoMlockCacheManipulator());
@@ -454,7 +457,7 @@ public class TestFsDatasetCache {
}, 100, 10000);
}
- @Test(timeout=60000)
+ @Test(timeout=600000)
public void testPageRounder() throws Exception {
// Write a small file
Path fileName = new Path("/testPageRounder");