Procházet zdrojové kódy

AMBARI-4189. 'DataNode maximum Java heap size' and 'Hadoop maximum Java heap size' overrides for config groups didn't get persisted during installer. (alexantonenko)

Alex Antonenko před 11 roky
rodič
revize
84ad92a529

+ 1 - 3
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')
           }]
@@ -1499,7 +1497,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";

+ 1 - 1
ambari-web/app/controllers/wizard/step8_controller.js

@@ -1535,7 +1535,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";