From 17be263e9be8236ac19a3d1ce4640df370136232 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Tue, 2 Apr 2013 02:16:35 +0000 Subject: [PATCH] YARN-516. Fix failure in TestContainerLocalizer caused by HADOOP-9357. Contributed by Andrew Wang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463362 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../localizer/TestContainerLocalizer.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9cfc81330e..ee1df6c7e8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -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 diff --git a/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 b/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 index 829eba4e1c..f16c68c11e 100644 --- a/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 +++ b/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 @@ -136,12 +136,16 @@ public void testContainerLocalizerMain() throws Exception { 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