This is an automated email from the ASF dual-hosted git repository.
jhung pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new a0291a0 YARN-9175. Null resources check in ResourceInfo for branch-3.0
a0291a0 is described below
commit a0291a015c1af0ea1282849bd8fb32824d7452fa
Author: Jonathan Hung <[email protected]>
AuthorDate: Thu Jan 3 15:58:10 2019 -0500
YARN-9175. Null resources check in ResourceInfo for branch-3.0
---
.../hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java
index e13980a..dd80d20 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ResourceInfo.java
@@ -62,7 +62,7 @@ public class ResourceInfo {
@Override
public String toString() {
- return resources.toString();
+ return getResource().toString();
}
public void setMemory(int memory) {
@@ -82,6 +82,9 @@ public class ResourceInfo {
}
public Resource getResource() {
+ if (resources == null) {
+ resources = Resource.newInstance(memory, vCores);
+ }
return Resource.newInstance(resources);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
