Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3085. Application summary should include the application type. Contributed by Rohith 

(cherry picked from commit a761bf8726)
This commit is contained in:
Jason Lowe 2015-02-03 14:56:34 +00:00
parent 7cb70d3447
commit 3828fb5fab
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -191,6 +191,9 @@ Release 2.7.0 - UNRELEASED
YARN-2808. Made YARN CLI list attempt’s finished containers of a running YARN-2808. Made YARN CLI list attempt’s finished containers of a running
application. (Naganarasimha G R via zjshen) application. (Naganarasimha G R via zjshen)
YARN-3085. Application summary should include the application type (Rohith
via jlowe)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java
View File

@ -172,7 +172,8 @@ public class RMAppManager implements EventHandler<RMAppManagerEvent>,
.add("vcoreSeconds", metrics.getVcoreSeconds()) .add("vcoreSeconds", metrics.getVcoreSeconds())
.add("preemptedAMContainers", metrics.getNumAMContainersPreempted()) .add("preemptedAMContainers", metrics.getNumAMContainersPreempted())
.add("preemptedNonAMContainers", metrics.getNumNonAMContainersPreempted()) .add("preemptedNonAMContainers", metrics.getNumNonAMContainersPreempted())
.add("preemptedResources", metrics.getResourcePreempted()); .add("preemptedResources", metrics.getResourcePreempted())
.add("applicationType", app.getApplicationType());
return summary; return summary;
} }

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
View File

@ -572,7 +572,7 @@ public class TestAppManager{
when(app.getUser()).thenReturn("Multiline\n\n\r\rUserName"); when(app.getUser()).thenReturn("Multiline\n\n\r\rUserName");
when(app.getQueue()).thenReturn("Multiline\n\n\r\rQueueName"); when(app.getQueue()).thenReturn("Multiline\n\n\r\rQueueName");
when(app.getState()).thenReturn(RMAppState.RUNNING); when(app.getState()).thenReturn(RMAppState.RUNNING);
when(app.getApplicationType()).thenReturn("MAPREDUCE");
RMAppMetrics metrics = RMAppMetrics metrics =
new RMAppMetrics(Resource.newInstance(1234, 56), 10, 1, 16384, 64); new RMAppMetrics(Resource.newInstance(1234, 56), 10, 1, 16384, 64);
when(app.getRMAppMetrics()).thenReturn(metrics); when(app.getRMAppMetrics()).thenReturn(metrics);
@ -593,6 +593,7 @@ public class TestAppManager{
Assert.assertTrue(msg.contains("preemptedAMContainers=1")); Assert.assertTrue(msg.contains("preemptedAMContainers=1"));
Assert.assertTrue(msg.contains("preemptedNonAMContainers=10")); Assert.assertTrue(msg.contains("preemptedNonAMContainers=10"));
Assert.assertTrue(msg.contains("preemptedResources=<memory:1234\\, vCores:56>")); Assert.assertTrue(msg.contains("preemptedResources=<memory:1234\\, vCores:56>"));
Assert.assertTrue(msg.contains("applicationType=MAPREDUCE"));
} }
private static ResourceScheduler mockResourceScheduler() { private static ResourceScheduler mockResourceScheduler() {