Explorar el Código

AMBARI-4768. Disable AHS store in configs and remove AHS link from UI. (srimanth)

Srimanth Gunturi hace 11 años
padre
commit
d291fb456d

+ 11 - 9
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>

+ 3 - 4
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"

+ 0 - 2
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;
   },
 

+ 0 - 13
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
   }
 ];

+ 1 - 1
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'