Updated Branches: refs/heads/trunk e65468a6c -> 9c3940bd0
AMBARI-2906. Add support for the following global config parameters for Yarn. (jaimin 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/9c3940bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/9c3940bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/9c3940bd Branch: refs/heads/trunk Commit: 9c3940bd071106c8d97d353b3599b09dcd584e31 Parents: e65468a Author: Yusaku Sako <[email protected]> Authored: Wed Aug 14 19:20:29 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Wed Aug 14 19:20:47 2013 -0700 ---------------------------------------------------------------------- .../controllers/main/service/info/configs.js | 3 +- .../app/controllers/wizard/step8_controller.js | 3 +- ambari-web/app/data/HDP2/config_properties.js | 45 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9c3940bd/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 982fb15..4bc3401 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -1345,12 +1345,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ * @return {Object} */ createGlobalSiteObj: function (tagName) { + var heapsizeException = ['hadoop_heapsize','yarn_heapsize','nodemanager_heapsize','resourcemanager_heapsize']; var globalSiteProperties = {}; this.get('globalConfigs').forEach(function (_globalSiteObj) { // do not pass any globalConfigs whose name ends with _host or _hosts if (!/_hosts?$/.test(_globalSiteObj.name)) { // append "m" to JVM memory options except for hadoop_heapsize - if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && _globalSiteObj.name !== 'hadoop_heapsize') { + if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && !heapsizeException.contains(_globalSiteObj.name)) { _globalSiteObj.value += "m"; } globalSiteProperties[_globalSiteObj.name] = _globalSiteObj.value; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9c3940bd/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index c4d2ce6..9645bee 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -1365,10 +1365,11 @@ App.WizardStep8Controller = Em.Controller.extend({ } globalSiteObj.forEach(function (_globalSiteObj) { + var heapsizeException = ['hadoop_heapsize','yarn_heapsize','nodemanager_heapsize','resourcemanager_heapsize']; // do not pass any globals whose name ends with _host or _hosts if (!/_hosts?$/.test(_globalSiteObj.name)) { // append "m" to JVM memory options except for hadoop_heapsize - if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && _globalSiteObj.name !== 'hadoop_heapsize') { + if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && !heapsizeException.contains(_globalSiteObj.name)) { globalSiteProperties[_globalSiteObj.name] = _globalSiteObj.value + "m"; } else { globalSiteProperties[_globalSiteObj.name] = _globalSiteObj.value; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9c3940bd/ambari-web/app/data/HDP2/config_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/config_properties.js b/ambari-web/app/data/HDP2/config_properties.js index 06ec263..2301225 100644 --- a/ambari-web/app/data/HDP2/config_properties.js +++ b/ambari-web/app/data/HDP2/config_properties.js @@ -688,6 +688,21 @@ module.exports = /**********************************************YARN***************************************/ { "id": "puppet var", + "name": "yarn_heapsize", + "displayName": "Yarn Java heap size", + "description": "Max heapsize for all YARN components", + "defaultValue": "1024", + "isOverridable": false, + "displayType": "int", + "unit": "MB", + "isVisible": true, + "domain": "global", + "serviceName": "YARN", + "category": "General", + "index": 0 + }, + { + "id": "puppet var", "name": "rm_host", "displayName": "ResourceManager", "description": "ResourceManager", @@ -702,6 +717,21 @@ module.exports = }, { "id": "puppet var", + "name": "resourcemanager_heapsize", + "displayName": "ResourceManager Java heap size", + "description": "Max heapsize for ResourceManager", + "defaultValue": "1024", + "isOverridable": false, + "displayType": "int", + "unit": "MB", + "isVisible": true, + "domain": "global", + "serviceName": "YARN", + "category": "ResourceManager", + "index": 0 + }, + { + "id": "puppet var", "name": "nm_hosts", "displayName": "NodeManager", "description": "List of NodeManager Hosts.", @@ -716,6 +746,21 @@ module.exports = }, { "id": "puppet var", + "name": "nodemanager_heapsize", + "displayName": "NodeManager Java heap size", + "description": "Max heapsize for NodeManager", + "defaultValue": "1024", + "isOverridable": false, + "displayType": "int", + "unit": "MB", + "isVisible": true, + "domain": "global", + "serviceName": "YARN", + "category": "NodeManager", + "index": 0 + }, + { + "id": "puppet var", "name": "yarn_log_dir_prefix", "displayName": "YARN Log Dir Prefix", "description": "",
