diff --git a/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java b/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java index a7e5d9c..d8f352f 100644 --- a/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java +++ b/src/main/java/org/apache/hadoop/yarn/server/utils/BuilderUtils.java @@ -316,7 +316,7 @@ public class BuilderUtils { public static ApplicationReport newApplicationReport( ApplicationId applicationId, ApplicationAttemptId applicationAttemptId, - String user, String queue, String name, String host, int rpcPort, + String user, String queue, String name, String description, String host, int rpcPort, Token clientToAMToken, YarnApplicationState state, String diagnostics, String url, long startTime, long finishTime, FinalApplicationStatus finalStatus, @@ -329,6 +329,7 @@ public class BuilderUtils { report.setUser(user); report.setQueue(queue); report.setName(name); + report.setDescription(description); report.setHost(host); report.setRpcPort(rpcPort); report.setClientToAMToken(clientToAMToken); @@ -348,7 +349,7 @@ public class BuilderUtils { } public static ApplicationSubmissionContext newApplicationSubmissionContext( - ApplicationId applicationId, String applicationName, String queue, + ApplicationId applicationId, String applicationName,String applicationDescription, String queue, Priority priority, ContainerLaunchContext amContainer, boolean isUnmanagedAM, boolean cancelTokensWhenComplete, int maxAppAttempts, Resource resource, String applicationType) { @@ -356,6 +357,7 @@ public class BuilderUtils { recordFactory.newRecordInstance(ApplicationSubmissionContext.class); context.setApplicationId(applicationId); context.setApplicationName(applicationName); + context.setApplicationDescription(applicationDescription); context.setQueue(queue); context.setPriority(priority); context.setAMContainerSpec(amContainer); @@ -368,11 +370,11 @@ public class BuilderUtils { } public static ApplicationSubmissionContext newApplicationSubmissionContext( - ApplicationId applicationId, String applicationName, String queue, + ApplicationId applicationId, String applicationName,String applicationDescription, String queue, Priority priority, ContainerLaunchContext amContainer, boolean isUnmanagedAM, boolean cancelTokensWhenComplete, int maxAppAttempts, Resource resource) { - return newApplicationSubmissionContext(applicationId, applicationName, + return newApplicationSubmissionContext(applicationId, applicationName,applicationDescription, queue, priority, amContainer, isUnmanagedAM, cancelTokensWhenComplete, maxAppAttempts, resource, null); } diff --git a/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java b/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java index 8fa4086..605340b 100644 --- a/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java +++ b/src/main/java/org/apache/hadoop/yarn/server/webapp/AppBlock.java @@ -113,7 +113,9 @@ public class AppBlock extends HtmlBlock { app.getFinishedTime()))) ._("Tracking URL:", app.getTrackingUrl() == null ? "#" : root_url(app.getTrackingUrl()), - "History")._("Diagnostics:", app.getDiagnosticsInfo()); + "History")._("Diagnostics:", app.getDiagnosticsInfo()) + ._("Description:", + app.getDescription() == null ? "" : app.getDescription()); html._(InfoBlock.class); diff --git a/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java b/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java index d78f928..9ac9446 100644 --- a/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java +++ b/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppInfo.java @@ -35,6 +35,7 @@ public class AppInfo { protected String currentAppAttemptId; protected String user; protected String name; + protected String description; protected String queue; protected String type; protected String host; @@ -62,6 +63,7 @@ public class AppInfo { user = app.getUser(); queue = app.getQueue(); name = app.getName(); + description = app.getDescription(); type = app.getApplicationType(); host = app.getHost(); rpcPort = app.getRpcPort(); @@ -149,4 +151,8 @@ public class AppInfo { return elapsedTime; } +public String getDescription() { + return description; +} + }