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

Addendum for YARN-5865. Retrospect updateApplicationPriority api to handle state store exception in align with YARN-5611

This commit is contained in:
Varun Saxena 2017-04-26 15:43:32 +05:30
parent ebcb575a12
commit c1f9f0529b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV1Publisher.java
View File

@ -88,7 +88,7 @@ public class TimelineServiceV1Publisher extends AbstractSystemMetricsPublisher {
ApplicationMetricsConstants.UNMANAGED_APPLICATION_ENTITY_INFO, ApplicationMetricsConstants.UNMANAGED_APPLICATION_ENTITY_INFO,
app.getApplicationSubmissionContext().getUnmanagedAM()); app.getApplicationSubmissionContext().getUnmanagedAM());
entityInfo.put(ApplicationMetricsConstants.APPLICATION_PRIORITY_INFO, entityInfo.put(ApplicationMetricsConstants.APPLICATION_PRIORITY_INFO,
app.getApplicationSubmissionContext().getPriority().getPriority()); app.getApplicationPriority().getPriority());
entityInfo.put(ApplicationMetricsConstants.AM_NODE_LABEL_EXPRESSION, entityInfo.put(ApplicationMetricsConstants.AM_NODE_LABEL_EXPRESSION,
app.getAmNodeLabelExpression()); app.getAmNodeLabelExpression());
entityInfo.put(ApplicationMetricsConstants.APP_NODE_LABEL_EXPRESSION, entityInfo.put(ApplicationMetricsConstants.APP_NODE_LABEL_EXPRESSION,

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java
View File

@ -118,7 +118,7 @@ public class TimelineServiceV2Publisher extends AbstractSystemMetricsPublisher {
ApplicationMetricsConstants.UNMANAGED_APPLICATION_ENTITY_INFO, ApplicationMetricsConstants.UNMANAGED_APPLICATION_ENTITY_INFO,
app.getApplicationSubmissionContext().getUnmanagedAM()); app.getApplicationSubmissionContext().getUnmanagedAM());
entityInfo.put(ApplicationMetricsConstants.APPLICATION_PRIORITY_INFO, entityInfo.put(ApplicationMetricsConstants.APPLICATION_PRIORITY_INFO,
app.getApplicationSubmissionContext().getPriority().getPriority()); app.getApplicationPriority().getPriority());
entity.getConfigs().put( entity.getConfigs().put(
ApplicationMetricsConstants.AM_NODE_LABEL_EXPRESSION, ApplicationMetricsConstants.AM_NODE_LABEL_EXPRESSION,
app.getAmNodeLabelExpression()); app.getAmNodeLabelExpression());

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TestSystemMetricsPublisherForV2.java
View File

@ -372,6 +372,7 @@ public class TestSystemMetricsPublisherForV2 {
.thenReturn(Collections.singletonList("java -Xmx1024m")); .thenReturn(Collections.singletonList("java -Xmx1024m"));
when(appSubmissionContext.getAMContainerSpec()) when(appSubmissionContext.getAMContainerSpec())
.thenReturn(containerLaunchContext); .thenReturn(containerLaunchContext);
when(app.getApplicationPriority()).thenReturn(Priority.newInstance(10));
when(app.getApplicationSubmissionContext()) when(app.getApplicationSubmissionContext())
.thenReturn(appSubmissionContext); .thenReturn(appSubmissionContext);