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/20 21:30:23 UTC
git commit: AMBARI-4768. Disable AHS store in configs and remove AHS
link from UI. (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 021b236bb -> d291fb456
AMBARI-4768. Disable AHS store in configs and remove AHS link from UI. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d291fb45
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d291fb45
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d291fb45
Branch: refs/heads/trunk
Commit: d291fb456da18e2911c46ec282e4ce1a127d4bd1
Parents: 021b236
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Thu Feb 20 11:28:05 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Thu Feb 20 12:30:14 2014 -0800
----------------------------------------------------------------------
.../services/YARN/configuration/yarn-site.xml | 20 +++++++++++---------
ambari-web/app/data/HDP2/site_properties.js | 7 +++----
.../app/mappers/service_metrics_mapper.js | 2 --
ambari-web/app/models/quick_links.js | 13 -------------
ambari-web/test/app_test.js | 2 +-
5 files changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d291fb45/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 b995b72..cc46d9e 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
@@ -342,21 +342,23 @@
<property>
<name>yarn.ats.store.class</name>
<value>org.apache.hadoop.yarn.server.applicationhistoryservice.apptimeline.LeveldbApplicationTimelineStore</value>
- <description></description>
+ <description>
+ Store class name for timeline service
+ </description>
</property>
<property>
- <name>yarn.ats.leveldb-timeline-store.path</name>
- <value>/var/log/hadoop-yarn/ats</value>
- <description></description>
+ <name>yarn.ahs.store.class</name>
+ <value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value>
+ <description>
+ Store class name for history service
+ </description>
</property>
<property>
- <name>yarn.ahs.fs-history-store.uri</name>
- <value>/tmp/yarn/system/ahstore</value>
- <description>
- Location where YARN's Application History Server stores information.
- </description>
+ <name>yarn.ats.leveldb-timeline-store.path</name>
+ <value>/var/log/hadoop-yarn/ats</value>
+ <description></description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d291fb45/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 41a013e..e5a6a04 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -324,11 +324,10 @@ module.exports =
},
{
"id": "site property",
- "name": "yarn.ahs.fs-history-store.uri",
- "displayName": "yarn.ahs.fs-history-store.uri",
+ "name": "yarn.ahs.store.class",
+ "displayName": "yarn.ahs.store.class",
"value": "",
- "defaultValue": "/tmp/yarn/system/ahstore",
- "displayType": "directory",
+ "defaultValue": "org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore",
"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/d291fb45/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index 656643e..600aad4 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -432,8 +432,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
// Map
var finalJson = this.parseIt(item, finalConfig);
finalJson.quick_links = [ 23, 24, 25, 26 ];
- if (App.supports.appTimelineServer)
- finalJson.quick_links.push(33);
return finalJson;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d291fb45/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 67d45b8..d141f2e 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -400,18 +400,5 @@ App.QuickLinks.FIXTURES = [
site: 'storm-site',
regex: portRegex,
default_http_port: 8744
- },
- // @todo Add real info about link
- {
- id:33,
- label:'App Timeline Server UI',
- url:'%@://%@:%@/ats',
- service_id: 'YARN',
- template:'%@://%@:%@/ats',
- http_config: 'yarn.resourcemanager.webapp.address',
- https_config: 'yarn.resourcemanager.webapp.https.address',
- site: 'yarn-site',
- regex: portRegex,
- default_http_port: 8088
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/d291fb45/ambari-web/test/app_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/app_test.js b/ambari-web/test/app_test.js
index f9f4087..83477e3 100644
--- a/ambari-web/test/app_test.js
+++ b/ambari-web/test/app_test.js
@@ -48,7 +48,7 @@ describe('#App', function() {
componentName: 'APP_TIMELINE_SERVER',
properties: {
global_properties: ['ats_host', 'apptimelineserver_heapsize'],
- site_properties: ['yarn.ahs.fs-history-store.uri', 'yarn.ats.store.class', 'yarn.ats.leveldb-timeline-store.path']
+ site_properties: ['yarn.ahs.store.class', 'yarn.ats.store.class', 'yarn.ats.leveldb-timeline-store.path']
},
reviewConfigs: {
component_name: 'APP_TIMELINE_SERVER'