Rebase onto trunk - fix some issues. Contributed by Rohith Sharma K S
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c136823 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c136823 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3c136823 Branch: refs/heads/yarn-native-services Commit: 3c136823a19a36bfa78225f484620d353e6e9d9a Parents: 1d5e214 Author: Jian He <jia...@apache.org> Authored: Mon Sep 4 22:07:24 2017 -0700 Committer: Jian He <jia...@apache.org> Committed: Tue Sep 19 21:36:21 2017 -0700 ---------------------------------------------------------------------- .../hadoop-yarn-services-api/pom.xml | 2 +- .../hadoop-yarn-services-core/pom.xml | 2 +- .../ServiceTimelinePublisher.java | 32 ++++++++++++-------- .../TestServiceTimelinePublisher.java | 2 -- .../hadoop-yarn-services/pom.xml | 2 +- .../src/main/webapp/app/routes/yarn-services.js | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c136823/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/pom.xml index 1077ccd..74d9681 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-applications</artifactId> - <version>3.0.0-beta1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <artifactId>hadoop-yarn-services-api</artifactId> <name>Apache Hadoop YARN Services API</name> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c136823/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml index d9b7adb..fb07edc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-services</artifactId> - <version>3.0.0-beta1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <artifactId>hadoop-yarn-services-core</artifactId> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c136823/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java index 5e65ad9..9e7d8e8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java @@ -66,6 +66,7 @@ public class ServiceTimelinePublisher extends CompositeService { protected void serviceInit(org.apache.hadoop.conf.Configuration configuration) throws Exception { addService(timelineClient); + super.serviceInit(configuration); } @@ -95,8 +96,8 @@ public class ServiceTimelinePublisher extends CompositeService { // create info keys Map<String, Object> entityInfos = new HashMap<String, Object>(); entityInfos.put(ServiceTimelineMetricsConstants.NAME, service.getName()); - entityInfos.put(ServiceTimelineMetricsConstants.STATE, - service.getState().toString()); +// entityInfos.put(ServiceTimelineMetricsConstants.STATE, +// service.getState().toString()); entityInfos.put(ServiceTimelineMetricsConstants.LAUNCH_TIME, currentTimeMillis); entity.addInfo(ServiceTimelineMetricsConstants.QUICK_LINKS, @@ -232,18 +233,23 @@ public class ServiceTimelinePublisher extends CompositeService { // create info keys Map<String, Object> entityInfos = new HashMap<String, Object>(); - entityInfos.put(ServiceTimelineMetricsConstants.ARTIFACT_ID, - component.getArtifact().getId()); - entityInfos.put(ServiceTimelineMetricsConstants.ARTIFACT_TYPE, - component.getArtifact().getType().toString()); - if (component.getResource().getProfile() != null) { - entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_PROFILE, - component.getResource().getProfile()); + if (component.getArtifact() != null) { + entityInfos.put(ServiceTimelineMetricsConstants.ARTIFACT_ID, + component.getArtifact().getId()); + entityInfos.put(ServiceTimelineMetricsConstants.ARTIFACT_TYPE, + component.getArtifact().getType().toString()); + } + + if (component.getResource() != null) { + entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_CPU, + component.getResource().getCpus()); + entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_MEMORY, + component.getResource().getMemory()); + if (component.getResource().getProfile() != null) { + entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_PROFILE, + component.getResource().getProfile()); + } } - entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_CPU, - component.getResource().getCpus()); - entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_MEMORY, - component.getResource().getMemory()); if (component.getLaunchCommand() != null) { entityInfos.put(ServiceTimelineMetricsConstants.LAUNCH_COMMAND, http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c136823/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java index b742553..e7c7600 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java @@ -82,9 +82,7 @@ public class TestServiceTimelinePublisher { timelineClient = new DummyTimelineClient(ApplicationId.fromString(SERVICEID)); serviceTimelinePublisher = new ServiceTimelinePublisher(timelineClient); - timelineClient.init(config); serviceTimelinePublisher.init(config); - timelineClient.start(); serviceTimelinePublisher.start(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c136823/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml index 1233804..716fdb7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hadoop-yarn-applications</artifactId> <groupId>org.apache.hadoop</groupId> - <version>3.0.0-beta1-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hadoop-yarn-services</artifactId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c136823/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js index 0f74f2f..a6535ae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js @@ -23,7 +23,7 @@ export default AbstractRoute.extend({ model() { return Ember.RSVP.hash({ apps: this.store.query('yarn-app', { - applicationTypes: "yarn-native-service" + applicationTypes: "yarn-service" }), }); }, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
