Repository: ambari Updated Branches: refs/heads/trunk 709f3d6cd -> 44b87c60d
AMBARI-5910. Add app name and version to app type details. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44b87c60 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44b87c60 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44b87c60 Branch: refs/heads/trunk Commit: 44b87c60dd2951eadc7263786e3961411d189ec0 Parents: 709f3d6 Author: Srimanth Gunturi <[email protected]> Authored: Tue May 27 20:17:13 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Tue May 27 20:17:20 2014 -0700 ---------------------------------------------------------------------- .../apache/ambari/view/slider/SliderApp.java | 254 ++++++++++--------- .../slider/SliderAppsViewControllerImpl.java | 17 +- 2 files changed, 152 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/44b87c60/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderApp.java ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderApp.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderApp.java index 6f7e45e..7d2c4be 100644 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderApp.java +++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderApp.java @@ -21,123 +21,141 @@ package org.apache.ambari.view.slider; import java.util.Map; public class SliderApp { - public static final String STATE_FROZEN = "FROZEN"; - - private String id; - private String yarnId; - private String name; - private String type; - private String user; - private String state; - private String diagnostics; - private long startTime; - private long endTime; - private Map<String, String> jmx; - private Map<String, String> urls; - private Map<String, Map<String, String>> configs; - private Map<String, SliderAppComponent> components; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getYarnId() { - return yarnId; - } - - public void setYarnId(String yarnId) { - this.yarnId = yarnId; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getDiagnostics() { - return diagnostics; - } - - public void setDiagnostics(String diagnostics) { - this.diagnostics = diagnostics; - } - - public Map<String, String> getJmx() { - return jmx; - } - - public void setJmx(Map<String, String> jmx) { - this.jmx = jmx; - } - - public Map<String, String> getUrls() { - return urls; - } - - public void setUrls(Map<String, String> urls) { - this.urls = urls; - } - - public Map<String, Map<String, String>> getConfigs() { - return configs; - } - - public void setConfigs(Map<String, Map<String, String>> configs) { - this.configs = configs; - } - - public Map<String, SliderAppComponent> getComponents() { - return components; - } - - public void setComponents(Map<String, SliderAppComponent> components) { - this.components = components; - } - - public long getStartTime() { - return startTime; - } - - public void setStartTime(long startTime) { - this.startTime = startTime; - } - - public long getEndTime() { - return endTime; - } + public static final String STATE_FROZEN = "FROZEN"; + + private String id; + private String yarnId; + private String name; + private String appVersion; + private String description; + private String type; + private String user; + private String state; + private String diagnostics; + private long startTime; + private long endTime; + private Map<String, String> jmx; + private Map<String, String> urls; + private Map<String, Map<String, String>> configs; + private Map<String, SliderAppComponent> components; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getYarnId() { + return yarnId; + } + + public void setYarnId(String yarnId) { + this.yarnId = yarnId; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getDiagnostics() { + return diagnostics; + } + + public void setDiagnostics(String diagnostics) { + this.diagnostics = diagnostics; + } + + public Map<String, String> getJmx() { + return jmx; + } + + public void setJmx(Map<String, String> jmx) { + this.jmx = jmx; + } + + public Map<String, String> getUrls() { + return urls; + } + + public void setUrls(Map<String, String> urls) { + this.urls = urls; + } + + public Map<String, Map<String, String>> getConfigs() { + return configs; + } + + public void setConfigs(Map<String, Map<String, String>> configs) { + this.configs = configs; + } + + public Map<String, SliderAppComponent> getComponents() { + return components; + } + + public void setComponents(Map<String, SliderAppComponent> components) { + this.components = components; + } + + public long getStartTime() { + return startTime; + } + + public void setStartTime(long startTime) { + this.startTime = startTime; + } + + public long getEndTime() { + return endTime; + } - public void setEndTime(long endTime) { - this.endTime = endTime; - } + public void setEndTime(long endTime) { + this.endTime = endTime; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getAppVersion() { + return appVersion; + } + + public void setAppVersion(String appVersion) { + this.appVersion = appVersion; + } } http://git-wip-us.apache.org/repos/asf/ambari/blob/44b87c60/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java index 7f44e04..679fa3a 100644 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java +++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java @@ -260,9 +260,24 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController { app.setUser(yarnApp.getUser()); app.setDiagnostics(yarnApp.getDiagnostics()); app.setYarnId(yarnApp.getApplicationId().toString()); - app.setType(yarnApp.getApplicationType()); app.setStartTime(yarnApp.getStartTime()); app.setEndTime(yarnApp.getFinishTime()); + Set<String> applicationTags = yarnApp.getApplicationTags(); + if (applicationTags != null && applicationTags.size() > 0) { + for (String tag : applicationTags) { + int index = tag.indexOf(':'); + if (index > 0 && index < tag.length() - 1) { + String key = tag.substring(0, index).trim(); + String value = tag.substring(index + 1).trim(); + if ("name".equals(key)) + app.setType(value); + else if ("version".equals(key)) + app.setAppVersion(value); + else if ("description".equals(key)) + app.setDescription(value); + } + } + } if (properties != null && !properties.isEmpty()) { SliderAppMasterClient sliderAppClient = yarnApp.getTrackingUrl() == null ? null : new SliderAppMasterClient(yarnApp.getTrackingUrl());
