You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/02/25 22:31:29 UTC
git commit: AMBARI-4825. YARN App Timeline Server does not start
after install. (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 5041884de -> 66478e112
AMBARI-4825. YARN App Timeline Server does not start after install. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/66478e11
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/66478e11
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/66478e11
Branch: refs/heads/trunk
Commit: 66478e1126449cf486b388f7e3372be201b64f69
Parents: 5041884
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue Feb 25 12:02:08 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Feb 25 13:31:16 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml | 2 +-
ambari-web/app/config.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js.orig | 2 +-
ambari-web/app/mappers/jobs/hive_job_mapper.js | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/66478e11/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
index 1bab6e3..6272b44 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/YARN/configuration/yarn-site.xml
@@ -341,7 +341,7 @@
<property>
<name>yarn.timeline-service.store-class</name>
- <value>org.apache.hadoop.yarn.server.applicationhistoryservice.apptimeline.LeveldbApplicationTimelineStore</value>
+ <value>org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore</value>
<description>
Store class name for timeline store
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/66478e11/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index a40899f..6422794 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -68,7 +68,7 @@ App.supports = {
deleteHost: true,
autoRollbackHA: false,
appTimelineServer: true,
- jobs: false
+ jobs: true
};
if (App.enableExperimental) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/66478e11/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 7f29b47..2da0c2a 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -317,7 +317,7 @@ module.exports =
"name": "yarn.timeline-service.store-class",
"displayName": "yarn.timeline-service.store-class",
"value": "",
- "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.apptimeline.LeveldbApplicationTimelineStore",
+ "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore",
"isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
"category": "AppTimelineServer",
"serviceName": "YARN"
http://git-wip-us.apache.org/repos/asf/ambari/blob/66478e11/ambari-web/app/data/HDP2/site_properties.js.orig
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js.orig b/ambari-web/app/data/HDP2/site_properties.js.orig
index 0f086a8..dbedd17 100644
--- a/ambari-web/app/data/HDP2/site_properties.js.orig
+++ b/ambari-web/app/data/HDP2/site_properties.js.orig
@@ -317,7 +317,7 @@ module.exports =
"name": "yarn.timeline-service.store-class",
"displayName": "yarn.timeline-service.store-class",
"value": "",
- "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbApplicationTimelineStore",
+ "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore",
"isVisible": App.supports.appTimelineServer, // @todo remove after Application Timeline Server approving
"category": "AppTimelineServer",
"serviceName": "YARN"
http://git-wip-us.apache.org/repos/asf/ambari/blob/66478e11/ambari-web/app/mappers/jobs/hive_job_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/jobs/hive_job_mapper.js b/ambari-web/app/mappers/jobs/hive_job_mapper.js
index 0a411be..126ed2e 100644
--- a/ambari-web/app/mappers/jobs/hive_job_mapper.js
+++ b/ambari-web/app/mappers/jobs/hive_job_mapper.js
@@ -56,7 +56,7 @@ App.hiveJobMapper = App.QuickDataMapper.create({
hiveJob.id = json.entity;
hiveJob.startTime = json.starttime;
hiveJob.endTime = json.endtime;
- json.otherinfo.query = $.parseJSON(json.otherinfo.query).query;
+ json.otherinfo.query = $.parseJSON(json.otherinfo.query);
hiveJob.stages = [];
var stagePlans = json.otherinfo.query.queryPlan["STAGE PLANS"];
for ( var stage in stagePlans) {