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 zj...@apache.org on 2015/04/18 00:35:42 UTC
[14/50] [abbrv] hadoop git commit: YARN-3382. Some of UserMetricsInfo
metrics are incorrectly set to root queue metrics. Contributed by Rohit
Agarwal
YARN-3382. Some of UserMetricsInfo metrics are incorrectly set to root queue metrics. Contributed by Rohit Agarwal
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/00346bac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/00346bac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/00346bac
Branch: refs/heads/YARN-2928
Commit: 00346bac2ca10ecc9162dae6f8bfb6fe40a5d44e
Parents: 0e60995
Author: Jian He <ji...@apache.org>
Authored: Mon Apr 13 10:53:34 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri Apr 17 15:29:41 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../resourcemanager/webapp/dao/UserMetricsInfo.java | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/00346bac/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3925f1c..d90d79a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -236,6 +236,9 @@ Release 2.8.0 - UNRELEASED
YARN-3465. Use LinkedHashMap to preserve order of resource requests.
(Zhihai Xu via kasha)
+ YARN-3382. Some of UserMetricsInfo metrics are incorrectly set to root
+ queue metrics. (Rohit Agarwal via jianhe)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/00346bac/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/UserMetricsInfo.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/UserMetricsInfo.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/UserMetricsInfo.java
index 73a83d7..bfa5bd2 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/UserMetricsInfo.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/UserMetricsInfo.java
@@ -63,11 +63,11 @@ public class UserMetricsInfo {
this.userMetricsAvailable = true;
this.appsSubmitted = userMetrics.getAppsSubmitted();
- this.appsCompleted = metrics.getAppsCompleted();
- this.appsPending = metrics.getAppsPending();
- this.appsRunning = metrics.getAppsRunning();
- this.appsFailed = metrics.getAppsFailed();
- this.appsKilled = metrics.getAppsKilled();
+ this.appsCompleted = userMetrics.getAppsCompleted();
+ this.appsPending = userMetrics.getAppsPending();
+ this.appsRunning = userMetrics.getAppsRunning();
+ this.appsFailed = userMetrics.getAppsFailed();
+ this.appsKilled = userMetrics.getAppsKilled();
this.runningContainers = userMetrics.getAllocatedContainers();
this.pendingContainers = userMetrics.getPendingContainers();