You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/11/05 03:22:58 UTC
git commit: AMBARI-3689: Invalid java opts configs in mapred-site.
(jaimin)
Updated Branches:
refs/heads/trunk 7b5e3914a -> 3ce506e2f
AMBARI-3689: Invalid java opts configs in mapred-site. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/3ce506e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3ce506e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3ce506e2
Branch: refs/heads/trunk
Commit: 3ce506e2f373735fbf16dbd79848992a5f04dd30
Parents: 7b5e391
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Nov 4 18:22:30 2013 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Nov 4 18:22:30 2013 -0800
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/utils/config.js | 3 +--
.../app/utils/defaults_providers/yarn_defaults_provider.js | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3ce506e2/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 273b2b1..edee875 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -98,7 +98,7 @@ App.WizardStep7Controller = Em.Controller.extend({
slaveComponentHosts: this.get('wizardController').getDBProperty('slaveComponentHosts')
};
//STEP 6: Distribute configs by service and wrap each one in App.ServiceConfigProperty (configs -> serviceConfigs)
- var serviceConfigs = App.config.renderConfigs(configs, storedConfigs, this.get('allInstalledServiceNames'), this.get('selectedServiceNames'), localDB, storedConfigs);
+ var serviceConfigs = App.config.renderConfigs(configs, storedConfigs, this.get('allInstalledServiceNames'), this.get('selectedServiceNames'), localDB);
this.set('stepConfigs', serviceConfigs);
this.activateSpecialConfigs();
this.set('selectedService', this.get('stepConfigs').filterProperty('showConfig', true).objectAt(0));
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3ce506e2/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index c032474..71d961e 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -466,10 +466,9 @@ App.config = Em.Object.create({
* @param allInstalledServiceNames
* @param selectedServiceNames
* @param localDB
- * @param storedConfigs
* @return {Array}
*/
- renderConfigs: function (configs, storedConfigs, allInstalledServiceNames, selectedServiceNames, localDB, storedConfigs) {
+ renderConfigs: function (configs, storedConfigs, allInstalledServiceNames, selectedServiceNames, localDB) {
var renderedServiceConfigs = [];
var services = [];
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3ce506e2/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js b/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
index 9e83949..4b10e97 100644
--- a/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
+++ b/ambari-web/app/utils/defaults_providers/yarn_defaults_provider.js
@@ -216,11 +216,11 @@ App.YARNDefaultsProvider = App.DefaultsProvider.create({
configs['yarn.scheduler.minimum-allocation-mb'] = Math.round(this.get('ramPerContainer'));
configs['yarn.scheduler.maximum-allocation-mb'] = Math.round(this.get('containers') * this.get('ramPerContainer'));
configs['yarn.app.mapreduce.am.resource.mb'] = Math.round(this.get('amMemory'));
- configs['yarn.app.mapreduce.am.command-opts'] = Math.round(0.8 * this.get('amMemory'));
+ configs['yarn.app.mapreduce.am.command-opts'] = "-Xmx" + Math.round(0.8 * this.get('amMemory')) + "m";
configs['mapreduce.map.memory.mb'] = Math.round(this.get('mapMemory'));
configs['mapreduce.reduce.memory.mb'] = Math.round(this.get('reduceMemory'));
- configs['mapreduce.map.java.opts'] = Math.round(0.8 * this.get('mapMemory'));
- configs['mapreduce.reduce.java.opts'] = Math.round(0.8 * this.get('reduceMemory'));
+ configs['mapreduce.map.java.opts'] = "-Xmx" + Math.round(0.8 * this.get('mapMemory')) + "m";
+ configs['mapreduce.reduce.java.opts'] = "-Xmx" + Math.round(0.8 * this.get('reduceMemory')) + "m";
configs['mapreduce.task.io.sort.mb'] = Math.round(0.4 * this.get('mapMemory'));
return configs;
},