Author: vinodkv Date: Tue Jan 8 13:23:04 2013 New Revision: 1430270 URL: http://svn.apache.org/viewvc?rev=1430270&view=rev Log: YARN-253. Fixed container-launch to not fail when there are no local resources to localize. Contributed by Tom White. svn merge --ignore-ancestry -c 1430269 ../../trunk/
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1430270&r1=1430269&r2=1430270&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Jan 8 13:23:04 2013 @@ -162,6 +162,9 @@ Release 2.0.3-alpha - Unreleased YARN-217. Fix RMAdmin protocol description to make it work in secure mode also. (Devaraj K via vinodkv) + YARN-253. Fixed container-launch to not fail when there are no local + resources to localize. (Tom White via vinodkv) + Release 2.0.2-alpha - 2012-09-07 YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java?rev=1430270&r1=1430269&r2=1430270&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java Tue Jan 8 13:23:04 2013 @@ -124,7 +124,7 @@ public class DefaultContainerExecutor ex Path appCacheDir = new Path(userdir, ContainerLocalizer.APPCACHE); Path appDir = new Path(appCacheDir, appIdStr); Path containerDir = new Path(appDir, containerIdStr); - createDir(containerDir, dirPerm, false); + createDir(containerDir, dirPerm, true); } // Create the container log-dirs on all disks Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java?rev=1430270&r1=1430269&r2=1430270&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java Tue Jan 8 13:23:04 2013 @@ -401,23 +401,9 @@ public class TestContainerManagerSecurit UnsupportedFileSystemException, YarnRemoteException, InterruptedException { - // TODO: Use a resource to work around bugs. Today NM doesn't create local - // app-dirs if there are no file to download!! - String fileName = "testFile-" + appID.toString(); - File testFile = new File(localDir.getAbsolutePath(), fileName); - FileWriter tmpFile = new FileWriter(testFile); - tmpFile.write("testing"); - tmpFile.close(); - URL testFileURL = ConverterUtils.getYarnUrlFromPath(FileContext - .getFileContext().makeQualified( - new Path(localDir.getAbsolutePath(), fileName))); - LocalResource rsrc = BuilderUtils.newLocalResource(testFileURL, - LocalResourceType.FILE, LocalResourceVisibility.PRIVATE, testFile - .length(), testFile.lastModified()); - ContainerLaunchContext amContainer = BuilderUtils .newContainerLaunchContext(null, "testUser", BuilderUtils - .newResource(1024), Collections.singletonMap(fileName, rsrc), + .newResource(1024), Collections.<String, LocalResource>emptyMap(), new HashMap<String, String>(), Arrays.asList("sleep", "100"), new HashMap<String, ByteBuffer>(), null, new HashMap<ApplicationAccessType, String>());