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 2015/02/03 15:57:49 UTC
hadoop git commit: YARN-3085. Application summary should include the
application type. Contributed by Rohith (cherry picked from commit
a761bf8726cb6285a505f1773ea3403eb985a65f)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 7cb70d344 -> 3828fb5fa
YARN-3085. Application summary should include the application type. Contributed by Rohith
(cherry picked from commit a761bf8726cb6285a505f1773ea3403eb985a65f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3828fb5f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3828fb5f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3828fb5f
Branch: refs/heads/branch-2
Commit: 3828fb5fab09beeaeaab47d3001a9c4a8f20fd73
Parents: 7cb70d3
Author: Jason Lowe <jl...@apache.org>
Authored: Tue Feb 3 14:56:34 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Tue Feb 3 14:57:25 2015 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../apache/hadoop/yarn/server/resourcemanager/RMAppManager.java | 3 ++-
.../apache/hadoop/yarn/server/resourcemanager/TestAppManager.java | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3828fb5f/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 596e143..7ddc4da 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -191,6 +191,9 @@ Release 2.7.0 - UNRELEASED
YARN-2808. Made YARN CLI list attempt’s finished containers of a running
application. (Naganarasimha G R via zjshen)
+ YARN-3085. Application summary should include the application type (Rohith
+ via jlowe)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3828fb5f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.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/RMAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
index f38e128..8dcfe67 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
@@ -172,7 +172,8 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>,
.add("vcoreSeconds", metrics.getVcoreSeconds())
.add("preemptedAMContainers", metrics.getNumAMContainersPreempted())
.add("preemptedNonAMContainers", metrics.getNumNonAMContainersPreempted())
- .add("preemptedResources", metrics.getResourcePreempted());
+ .add("preemptedResources", metrics.getResourcePreempted())
+ .add("applicationType", app.getApplicationType());
return summary;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3828fb5f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
index 6b3eea2..d2ac4ef 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
@@ -572,7 +572,7 @@ public class TestAppManager{
when(app.getUser()).thenReturn("Multiline\n\n\r\rUserName");
when(app.getQueue()).thenReturn("Multiline\n\n\r\rQueueName");
when(app.getState()).thenReturn(RMAppState.RUNNING);
-
+ when(app.getApplicationType()).thenReturn("MAPREDUCE");
RMAppMetrics metrics =
new RMAppMetrics(Resource.newInstance(1234, 56), 10, 1, 16384, 64);
when(app.getRMAppMetrics()).thenReturn(metrics);
@@ -593,6 +593,7 @@ public class TestAppManager{
Assert.assertTrue(msg.contains("preemptedAMContainers=1"));
Assert.assertTrue(msg.contains("preemptedNonAMContainers=10"));
Assert.assertTrue(msg.contains("preemptedResources=<memory:1234\\, vCores:56>"));
+ Assert.assertTrue(msg.contains("applicationType=MAPREDUCE"));
}
private static ResourceScheduler mockResourceScheduler() {