You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2018/09/05 22:37:21 UTC
hadoop git commit: YARN-8730.
TestRMWebServiceAppsNodelabel#testAppsRunning fails. Contributed by Eric
Payne
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 1359e8da7 -> 829d94d86
YARN-8730. TestRMWebServiceAppsNodelabel#testAppsRunning fails. Contributed by Eric Payne
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/829d94d8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/829d94d8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/829d94d8
Branch: refs/heads/branch-2.8
Commit: 829d94d869cb7ba844bdc3cbb83afabd4804ec5f
Parents: 1359e8d
Author: Jason Lowe <jl...@apache.org>
Authored: Wed Sep 5 17:31:51 2018 -0500
Committer: Jason Lowe <jl...@apache.org>
Committed: Wed Sep 5 17:31:51 2018 -0500
----------------------------------------------------------------------
.../yarn/server/resourcemanager/webapp/dao/ResourceInfo.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/829d94d8/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
----------------------------------------------------------------------
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 df3d1f0..5083943 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
@@ -27,7 +27,6 @@ import org.apache.hadoop.yarn.api.records.Resource;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class ResourceInfo {
- Resource res;
long memory;
int vCores;
@@ -35,7 +34,6 @@ public class ResourceInfo {
}
public ResourceInfo(Resource res) {
- this.res = res;
memory = res.getMemorySize();
vCores = res.getVirtualCores();
}
@@ -62,6 +60,6 @@ public class ResourceInfo {
}
public Resource getResource() {
- return res;
+ return Resource.newInstance(memory, vCores);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org