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

YARN-8339. Service AM should localize static/archive resource types to container working directory instead of 'resources'. (Suma Shivaprasad via wangda) 

Change-Id: I9f8e8f621650347f6c2f9e3420edee9eb2f356a4
This commit is contained in:
Wangda Tan 2018-05-29 09:23:11 -07:00
parent 3c75f8e493
commit 3061bfcde5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderUtils.java
View File

@ -298,8 +298,7 @@ public class ProviderUtils implements YarnServiceConstants {
destFile = new Path(staticFile.getDestFile()); destFile = new Path(staticFile.getDestFile());
} }
String symlink = APP_RESOURCES_DIR + "/" + destFile.getName(); addLocalResource(launcher, destFile.getName(), localResource, destFile);
addLocalResource(launcher, symlink, localResource, destFile);
} }
} }

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestProviderUtils.java
View File

@ -154,11 +154,11 @@ public class TestProviderUtils {
ProviderUtils.handleStaticFilesForLocalization(launcher, sfs, ProviderUtils.handleStaticFilesForLocalization(launcher, sfs,
compLaunchCtx); compLaunchCtx);
Mockito.verify(launcher).addLocalResource(Mockito.eq("resources/destFile1"), Mockito.verify(launcher).addLocalResource(Mockito.eq("destFile1"),
any(LocalResource.class)); any(LocalResource.class));
Mockito.verify(launcher).addLocalResource( Mockito.verify(launcher).addLocalResource(
Mockito.eq("resources/destFile_2"), any(LocalResource.class)); Mockito.eq("destFile_2"), any(LocalResource.class));
Mockito.verify(launcher).addLocalResource( Mockito.verify(launcher).addLocalResource(
Mockito.eq("resources/sourceFile4"), any(LocalResource.class)); Mockito.eq("sourceFile4"), any(LocalResource.class));
} }
} }