Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r1593660 from trunk: YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the output path and a format issue in trunk. (Contributed by Siddharth Seth) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593661 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Junping Du 2014-05-10 03:47:43 +00:00
parent fea7cd3c12
commit 4b27c6882a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -52,6 +52,9 @@ Release 2.5.0 - UNRELEASED
YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray
Chiang via Sandy Ryza) Chiang via Sandy Ryza)
YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the output path and a format
issue in trunk. (Contributed by Siddharth Seth)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
View File

@ -252,7 +252,7 @@ public class TestNodeManagerShutdown {
*/ */
private static File createUnhaltingScriptFile(ContainerId cId, private static File createUnhaltingScriptFile(ContainerId cId,
File scriptFileDir, File processStartFile) throws IOException { File scriptFileDir, File processStartFile) throws IOException {
File scriptFile = new File(scriptFileDir, "scriptFile.sh"); File scriptFile = Shell.appendScriptExtension(scriptFileDir, "scriptFile");
PrintWriter fileWriter = new PrintWriter(scriptFile); PrintWriter fileWriter = new PrintWriter(scriptFile);
if (Shell.WINDOWS) { if (Shell.WINDOWS) {
fileWriter.println("@echo \"Running testscript for delayed kill\""); fileWriter.println("@echo \"Running testscript for delayed kill\"");