ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-3004. Categorize YARN properties properly. (atkach via yusaku)
Date Fri, 23 Aug 2013 21:59:06 GMT
Updated Branches:
  refs/heads/trunk d8f71bbe2 -> 62c381115


AMBARI-3004. Categorize YARN properties properly. (atkach via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/62c38111
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/62c38111
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/62c38111

Branch: refs/heads/trunk
Commit: 62c381115e6097cc53e10a6083edd3fcce5870c7
Parents: d8f71bb
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Fri Aug 23 14:58:35 2013 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Fri Aug 23 14:58:55 2013 -0700

----------------------------------------------------------------------
 .../services/YARN/configuration/yarn-site.xml   |  10 ++
 .../services/YARN/configuration/yarn-site.xml   |  10 ++
 ambari-web/app/data/HDP2/site_properties.js     | 119 +++++++++++++++++++
 ambari-web/app/data/service_configs.js          |   6 +-
 ambari-web/app/utils/config.js                  |   5 +-
 5 files changed, 146 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/62c38111/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
index af842b3..24ed7eb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
@@ -74,6 +74,16 @@
       and will get capped to this value.
     </description>
   </property>
+  
+  <property>
+    <name>yarn.acl.enable</name>
+    <value>true</value>
+  </property>
+  
+  <property>
+    <name>yarn.admin.acl</name>
+    <value>*</value>
+  </property>
 
 <!-- NodeManager -->
 

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/62c38111/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
index d7f9e49..34489b9 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml
@@ -74,6 +74,16 @@
       and will get capped to this value.
     </description>
   </property>
+  
+  <property>
+    <name>yarn.acl.enable</name>
+    <value>true</value>
+  </property>
+  
+  <property>
+    <name>yarn.admin.acl</name>
+    <value>*</value>
+  </property>
 
   <!-- NodeManager -->
 

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/62c38111/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 bc68d25..ba2a923 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -18,5 +18,124 @@
 module.exports =
 {
   "configProperties": [
+    {
+      "id": "site property",
+      "name": "yarn.acl.enable",
+      "displayName": "yarn.acl.enable",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "ResourceManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.admin.acl",
+      "displayName": "yarn.admin.acl",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "ResourceManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.log-aggregation-enable",
+      "displayName": "yarn.log-aggregation-enable",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "ResourceManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.resourcemanager.scheduler.class",
+      "displayName": "yarn.resourcemanager.scheduler.class",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "CapacityScheduler"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.scheduler.minimum-allocation-mb",
+      "displayName": "yarn.scheduler.minimum-allocation-mb",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "CapacityScheduler"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.scheduler.maximum-allocation-mb",
+      "displayName": "yarn.scheduler.maximum-allocation-mb",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "CapacityScheduler"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.resource.memory-mb",
+      "displayName": "yarn.nodemanager.resource.memory-mb",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.vmem-pmem-ratio",
+      "displayName": "yarn.nodemanager.vmem-pmem-ratio",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.log-dirs",
+      "displayName": "yarn.nodemanager.log-dirs",
+      "value": "",
+      "defaultValue": "",
+      "displayType": "directories",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.remote-app-log-dir",
+      "displayName": "yarn.nodemanager.remote-app-log-dir",
+      "value": "",
+      "defaultValue": "",
+      "displayType": "directory",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.remote-app-log-dir-suffix",
+      "displayName": "yarn.nodemanager.remote-app-log-dir-suffix",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.aux-services",
+      "displayName": "yarn.nodemanager.aux-services",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    },
+    {
+      "id": "site property",
+      "name": "yarn.nodemanager.log.retain-second",
+      "displayName": "yarn.nodemanager.log.retain-second",
+      "value": "",
+      "defaultValue": "",
+      "serviceName": "YARN",
+      "category": "NodeManager"
+    }
   ]
 };

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/62c38111/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index 5bfeff5..26f4abf 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -69,10 +69,10 @@ module.exports = [
     displayName: 'YARN',
     filename: 'yarn-site',
     configCategories: [
-      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'ResourceManager',
hostComponentNames : ['RESOURCEMANAGER']}),
-      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'NodeManager',
hostComponentNames : ['NODEMANAGER']}),
+      App.ServiceConfigCategory.create({ name: 'ResourceManager', displayName : 'Resource
Manager', hostComponentNames : ['RESOURCEMANAGER']}),
+      App.ServiceConfigCategory.create({ name: 'NodeManager', displayName : 'Node Manager',
hostComponentNames : ['NODEMANAGER']}),
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
-      App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Capacity
Scheduler', isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml',
siteFileNames: ['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: App.supports.capacitySchedulerUi}),
+      App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName : 'Scheduler',
isCapacityScheduler : true, isCustomView: true, siteFileName: 'capacity-scheduler.xml', siteFileNames:
['capacity-scheduler.xml', 'mapred-queue-acls.xml'], canAddProperty: App.supports.capacitySchedulerUi}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedYARNSite', displayName : 'Custom
yarn-site.xml', siteFileName: 'yarn-site.xml', canAddProperty: true})
     ],

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/62c38111/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index b768299..af24562 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -287,7 +287,10 @@ App.config = Em.Object.create({
       } else if (preDefined && !stored) {
         configData = preDefined;
         if (isAdvanced) {
-          configData.filename = advancedConfigs.findProperty('name', configData.name).filename;
+          var advanced = advancedConfigs.findProperty('name', configData.name);
+          configData.value = advanced.value;
+          configData.defaultValue = advanced.value;
+          configData.filename = advanced.filename;
         }
       }
       mergedConfigs.push(configData);


Mime
View raw message