You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2013/12/27 18:13:08 UTC
git commit: AMBARI-4189. 'DataNode maximum Java heap size' and
'Hadoop maximum Java heap size' overrides for config groups didn't get
persisted during installer. (alexantonenko)
Updated Branches:
refs/heads/branch-1.4.3 0fcbe265c -> 5c7086edb
AMBARI-4189. 'DataNode maximum Java heap size' and 'Hadoop maximum Java heap size' overrides for config groups didn't get persisted during installer. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c7086ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c7086ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c7086ed
Branch: refs/heads/branch-1.4.3
Commit: 5c7086edbc2cc012cb22843ee6502d92f46755bf
Parents: 0fcbe26
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Dec 27 19:10:53 2013 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Dec 27 19:10:53 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 4 +---
ambari-web/app/controllers/wizard/step8_controller.js | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c7086ed/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 a24e040..4825654 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -984,7 +984,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
var site = sites.findProperty('type', type);
if (site) {
site.properties.push({
- isRequiredByAgent: config.get('isRequiredByAgent'),
name: config.get('name'),
value: config.get('value')
});
@@ -993,7 +992,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
type: type,
tag: 'version' + time,
properties: [{
- isRequiredByAgent: config.get('isRequiredByAgent'),
name: config.get('name'),
value: config.get('value')
}]
@@ -1517,7 +1515,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
var globalSiteProperties = {};
globalConfigs.forEach(function (_globalSiteObj) {
// do not pass any globalConfigs whose name ends with _host or _hosts
- if (_globalSiteObj.isRequiredByAgent === true) {
+ if (_globalSiteObj.isRequiredByAgent !== false) {
// append "m" to JVM memory options except for hadoop_heapsize
if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && !heapsizeException.contains(_globalSiteObj.name)) {
_globalSiteObj.value += "m";
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c7086ed/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 450da90..aa2f37f 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1528,7 +1528,7 @@ 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 (_globalSiteObj.isRequiredByAgent === true) {
+ if (_globalSiteObj.isRequiredByAgent !== false) {
// append "m" to JVM memory options except for hadoop_heapsize
if (/_heapsize|_newsize|_maxnewsize$/.test(_globalSiteObj.name) && !heapsizeException.contains(_globalSiteObj.name)) {
globalSiteProperties[_globalSiteObj.name] = _globalSiteObj.value + "m";