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 ji...@apache.org on 2015/04/13 19:54:25 UTC
hadoop git commit: YARN-3382. Some of UserMetricsInfo metrics are
incorrectly set to root queue metrics. Contributed by Rohit Agarwal (cherry
picked from commit 944a16579fdb54c1c420162ef830ef2ac5451c69)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 bc979ff3b -> 32b01263d
YARN-3382. Some of UserMetricsInfo metrics are incorrectly set to root queue metrics. Contributed by Rohit Agarwal
(cherry picked from commit 944a16579fdb54c1c420162ef830ef2ac5451c69)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/32b01263
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/32b01263
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/32b01263
Branch: refs/heads/branch-2
Commit: 32b01263d3c9b5469f1b7ff9f21170823a8bf10c
Parents: bc979ff
Author: Jian He <ji...@apache.org>
Authored: Mon Apr 13 10:53:34 2015 -0700
Committer: Jian He <ji...@apache.org>
Committed: Mon Apr 13 10:54:15 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/32b01263/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2cc8837..fec48e2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -129,6 +129,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/32b01263/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();