From e463efc4cb29e73c133449825cd3d6f29af00498 Mon Sep 17 00:00:00 2001 From: Jason Darrell Lowe Date: Tue, 13 May 2014 16:44:58 +0000 Subject: [PATCH] svn merge -c 1594275 FIXES: YARN-1751. Improve MiniYarnCluster for log aggregation testing. Contributed by Ming Ma git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594276 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7d5507e3d31..97b1030443a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -61,6 +61,9 @@ Release 2.5.0 - UNRELEASED YARN-1987. Wrapper for leveldb DBIterator to aid in handling database exceptions. (Jason Lowe via kasha) + YARN-1751. Improve MiniYarnCluster for log aggregation testing (Ming Ma + via jlowe) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java index f6416641344..5640c75fa69 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java @@ -504,12 +504,6 @@ protected synchronized void serviceInit(Configuration conf) String logDirsString = prepareDirs("log", numLogDirs); config.set(YarnConfiguration.NM_LOG_DIRS, logDirsString); - File remoteLogDir = - new File(testWorkDir, MiniYARNCluster.this.getName() - + "-remoteLogDir-nm-" + index); - remoteLogDir.mkdir(); - config.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR, - remoteLogDir.getAbsolutePath()); // By default AM + 2 containers config.setInt(YarnConfiguration.NM_PMEM_MB, 4*1024); config.set(YarnConfiguration.NM_ADDRESS,