Bläddra i källkod

AMBARI-3635: Property yarn.log.server.url cannot be changed on ui. (jaimin)

Jaimin Jetly 11 år sedan
förälder
incheckning
a8309ce096

+ 8 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml

@@ -309,4 +309,12 @@
     </description>
   </property>
 
+  <property>
+    <name>yarn.log.server.url</name>
+    <value>http://localhost:19888/jobhistory/logs</value>
+    <description>
+      URI for the HistoryServer's log resource
+    </description>
+  </property>
+
 </configuration>

+ 8 - 0
ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml

@@ -309,4 +309,12 @@
     </description>
   </property>
 
+  <property>
+    <name>yarn.log.server.url</name>
+    <value>http://localhost:19888/jobhistory/logs</value>
+    <description>
+      URI for the HistoryServer's log resource
+    </description>
+  </property>
+
 </configuration>

+ 0 - 7
ambari-web/app/data/HDP2/config_mapping.js

@@ -181,13 +181,6 @@ var configs = [
     "value": "<templateName[0]>:8141",
     "filename": "yarn-site.xml"
   },
-  {
-    "name": "yarn.log.server.url",
-    "templateName": ["hs_host"],
-    "foreignKey": null,
-    "value": "http://<templateName[0]>:19888/jobhistory/logs",
-    "filename": "yarn-site.xml"
-  },
 
 /**********************************************mapred-site***************************************/
   {

+ 9 - 0
ambari-web/app/data/HDP2/site_properties.js

@@ -299,6 +299,15 @@ module.exports =
       "serviceName": "YARN",
       "category": "NodeManager"
     },
+    {
+      "id": "site property",
+      "name": "yarn.log.server.url",
+      "displayName": "yarn.log.server.url",
+      "value": "",
+      "defaultValue": "",
+      "category": "Advanced",
+      "serviceName": "YARN"
+    },
 
   /**********************************************MAPREDUCE2***************************************/
     {

+ 7 - 0
ambari-web/app/models/service_config.js

@@ -248,6 +248,13 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'hs_host':
         this.set('value', masterComponentHostsInDB.filterProperty('component', 'HISTORYSERVER').mapProperty('hostName'));
         break;
+      case 'yarn.log.server.url':
+        var hsHost = masterComponentHostsInDB.filterProperty('component', 'HISTORYSERVER').mapProperty('hostName');
+        var defaultValue = this.get('defaultValue');
+        defaultValue = defaultValue.replace(/:\/\/(\w*)(?=:)/,'://' + hsHost);
+        this.set('defaultValue',defaultValue);
+        this.set('value',this.get('defaultValue'));
+        break;
       case 'rm_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName);
         break;