Author: vinodkv
Date: Tue Apr 2 02:16:35 2013
New Revision: 1463362
URL: http://svn.apache.org/r1463362
Log:
YARN-516. Fix failure in TestContainerLocalizer caused by HADOOP-9357.
Contributed by Andrew Wang.
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1463362&r1=1463361&r2=1463362&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Tue Apr 2 02:16:35 2013
@@ -170,6 +170,9 @@ Release 2.0.5-beta - UNRELEASED
YARN-515. Node Manager not getting the master key. (Robert Joseph Evans
via jlowe)
+ YARN-516. Fix failure in TestContainerLocalizer caused by HADOOP-9357.
+ (Andrew Wang via vinodkv)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java?rev=1463362&r1=1463361&r2=1463362&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestContainerLocalizer.java
Tue Apr 2 02:16:35 2013
@@ -136,12 +136,16 @@ public class TestContainerLocalizer {
Path base = new Path(new Path(p, ContainerLocalizer.USERCACHE), appUser);
Path privcache = new Path(base, ContainerLocalizer.FILECACHE);
// $x/usercache/$user/filecache
- verify(spylfs).mkdir(eq(privcache), isA(FsPermission.class), eq(false));
+ // FileContext drops the scheme if no authority is present before passing
+ // the path to an AbstractFileSystem
+ Path privcacheAfsPath = new Path(privcache.toUri().getPath());
+ verify(spylfs).mkdir(eq(privcacheAfsPath), isA(FsPermission.class),
eq(false));
Path appDir =
new Path(base, new Path(ContainerLocalizer.APPCACHE, appId));
// $x/usercache/$user/appcache/$appId/filecache
Path appcache = new Path(appDir, ContainerLocalizer.FILECACHE);
- verify(spylfs).mkdir(eq(appcache), isA(FsPermission.class), eq(false));
+ Path appcacheAfsPath = new Path(appcache.toUri().getPath());
+ verify(spylfs).mkdir(eq(appcacheAfsPath), isA(FsPermission.class),
eq(false));
}
// verify tokens read at expected location
