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

YARN-7718. DistributedShell failed to specify resource other than memory/vcores from container_resources. Contributed by Wangda Tan.

Browse Source
This commit is contained in:
Sunil G 2018-01-09 16:39:33 +05:30
parent b3290c41a9
commit 783a01eb4a
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
View File

@ -1602,18 +1602,16 @@ private ProfileCapability createProfileCapability()
Resource resourceCapability = Resource resourceCapability =
Resource.newInstance(containerMemory, containerVirtualCores); Resource.newInstance(containerMemory, containerVirtualCores);
if (resourceProfiles == null) { containerMemory =
containerMemory = containerMemory == -1 ? DEFAULT_CONTAINER_MEMORY : containerMemory == -1 ? DEFAULT_CONTAINER_MEMORY : containerMemory;
containerMemory; containerVirtualCores = containerVirtualCores == -1 ?
containerVirtualCores = DEFAULT_CONTAINER_VCORES :
containerVirtualCores == -1 ? DEFAULT_CONTAINER_VCORES :
containerVirtualCores; containerVirtualCores;
resourceCapability.setMemorySize(containerMemory); resourceCapability.setMemorySize(containerMemory);
resourceCapability.setVirtualCores(containerVirtualCores); resourceCapability.setVirtualCores(containerVirtualCores);
for (Map.Entry<String, Long> entry : containerResources.entrySet()) { for (Map.Entry<String, Long> entry : containerResources.entrySet()) {
resourceCapability.setResourceValue(entry.getKey(), entry.getValue()); resourceCapability.setResourceValue(entry.getKey(), entry.getValue());
} }
}
String profileName = containerResourceProfile; String profileName = containerResourceProfile;
if ("".equals(containerResourceProfile) && resourceProfiles != null) { if ("".equals(containerResourceProfile) && resourceProfiles != null) {