YARN-516. Reverting the patch from branch-2 as HADOOP-9357 also got reverted.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476839 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-04-28 21:15:39 +00:00
parent e11dd72dc1
commit 373db7be2a
2 changed files with 2 additions and 9 deletions

View File

@ -177,9 +177,6 @@ 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)
YARN-382. SchedulerUtils improve way normalizeRequest sets the resource
capabilities. (Zhijie Shen via bikas)

View File

@ -164,16 +164,12 @@ public class TestContainerLocalizer {
Path base = new Path(new Path(p, ContainerLocalizer.USERCACHE), appUser);
Path privcache = new Path(base, ContainerLocalizer.FILECACHE);
// $x/usercache/$user/filecache
// 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));
verify(spylfs).mkdir(eq(privcache), 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);
Path appcacheAfsPath = new Path(appcache.toUri().getPath());
verify(spylfs).mkdir(eq(appcacheAfsPath), isA(FsPermission.class), eq(false));
verify(spylfs).mkdir(eq(appcache), isA(FsPermission.class), eq(false));
}
// verify tokens read at expected location
verify(spylfs).open(tokenPath);