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

YARN-7270 addendum: Reapplied changes after YARN-3926 backports

This commit is contained in:
Daniel Templeton 2017-10-16 11:43:54 -07:00
parent 0f7786cee3
commit 0bc3c9fca2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/Resource.java
View File

@ -285,7 +285,7 @@ public abstract class Resource implements Comparable<Resource> {
return; return;
} }
if (resource.equals(ResourceInformation.VCORES_URI)) { if (resource.equals(ResourceInformation.VCORES_URI)) {
this.setVirtualCores((int) resourceInformation.getValue()); this.setVirtualCores(castToIntSafely(resourceInformation.getValue()));
return; return;
} }
ResourceInformation storedResourceInfo = getResourceInformation(resource); ResourceInformation storedResourceInfo = getResourceInformation(resource);
@ -331,7 +331,7 @@ public abstract class Resource implements Comparable<Resource> {
return; return;
} }
if (resource.equals(ResourceInformation.VCORES_URI)) { if (resource.equals(ResourceInformation.VCORES_URI)) {
this.setVirtualCores((int)value); this.setVirtualCores(castToIntSafely(value));
return; return;
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/LightWeightResource.java
View File

@ -92,7 +92,7 @@ public class LightWeightResource extends Resource {
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public int getMemory() { public int getMemory() {
return (int) memoryResInfo.getValue(); return castToIntSafely(memoryResInfo.getValue());
} }
@Override @Override
@ -113,7 +113,7 @@ public class LightWeightResource extends Resource {
@Override @Override
public int getVirtualCores() { public int getVirtualCores() {
return (int) vcoresResInfo.getValue(); return castToIntSafely(vcoresResInfo.getValue());
} }
@Override @Override

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java
View File

@ -117,7 +117,7 @@ public class ResourcePBImpl extends Resource {
@Override @Override
public int getVirtualCores() { public int getVirtualCores() {
// vcores should always be present // vcores should always be present
return (int) resources[VCORES_INDEX].getValue(); return castToIntSafely(resources[VCORES_INDEX].getValue());
} }
@Override @Override