From 75e6b7428e2a59cae19cddadca4c26397fa3f055 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Fri, 17 Mar 2017 14:06:35 -0500 Subject: [PATCH] YARN-6217. TestLocalCacheDirectoryManager test timeout is too aggressive. Contributed by Miklos Szegedi (cherry picked from commit 4a8e3045027036afebbcb80f23b7a2886e56c255) --- .../localizer/TestLocalCacheDirectoryManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestLocalCacheDirectoryManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestLocalCacheDirectoryManager.java index df00f9e7ed0..82d9a946661 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestLocalCacheDirectoryManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestLocalCacheDirectoryManager.java @@ -33,7 +33,7 @@ import org.junit.Test; public class TestLocalCacheDirectoryManager { - @Test(timeout = 10000) + @Test public void testHierarchicalSubDirectoryCreation() { // setting per directory file limit to 1. YarnConfiguration conf = new YarnConfiguration(); @@ -73,7 +73,7 @@ public class TestLocalCacheDirectoryManager { Assert.assertEquals(testPath2, hDir.getRelativePathForLocalization()); } - @Test(timeout = 10000) + @Test public void testMinimumPerDirectoryFileLimit() { YarnConfiguration conf = new YarnConfiguration(); conf.set(YarnConfiguration.NM_LOCAL_CACHE_MAX_FILES_PER_DIRECTORY, "1"); @@ -98,7 +98,7 @@ public class TestLocalCacheDirectoryManager { } - @Test(timeout = 1000) + @Test public void testDirectoryStateChangeFromFullToNonFull() { YarnConfiguration conf = new YarnConfiguration(); conf.set(YarnConfiguration.NM_LOCAL_CACHE_MAX_FILES_PER_DIRECTORY, "40");