AMBARI-3708. Reconfigure of dynamic configs not showing modified values. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/3bd4b535 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3bd4b535 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3bd4b535 Branch: refs/heads/branch-1.4-bk Commit: 3bd4b535c889926eea463cb9d4165b04062d2558 Parents: 24b8a58 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Wed Nov 6 15:53:07 2013 -0800 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Wed Nov 6 16:01:01 2013 -0800 ---------------------------------------------------------------------- .../app/controllers/main/service/info/configs.js | 19 +++++++++++-------- .../validators/mapreduce2_configs_validator.js | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3bd4b535/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 b77e4db..24c9a72 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -657,14 +657,17 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ } if (serviceConfigProperty.get('serviceName') === this.get('content.serviceName')) { - defaults.forEach(function(defaults) { - for(var name in defaults) { - if (serviceConfigProperty.name == name) { - serviceConfigProperty.set('value', defaults[name]); - serviceConfigProperty.set('defaultValue', defaults[name]); - } - } - }); + // Do not reset values when reconfiguring. + // This might be useful to setting better descriptions + // or default values sometime in the future. + // defaults.forEach(function(defaults) { + // for(var name in defaults) { + // if (serviceConfigProperty.name == name) { + // serviceConfigProperty.set('value', defaults[name]); + // serviceConfigProperty.set('defaultValue', defaults[name]); + // } + // } + // }); if (s.configsValidator) { var validators = s.configsValidator.get('configValidators'); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3bd4b535/ambari-web/app/utils/configs/validators/mapreduce2_configs_validator.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/configs/validators/mapreduce2_configs_validator.js b/ambari-web/app/utils/configs/validators/mapreduce2_configs_validator.js index d2f30d2..b1e2583 100644 --- a/ambari-web/app/utils/configs/validators/mapreduce2_configs_validator.js +++ b/ambari-web/app/utils/configs/validators/mapreduce2_configs_validator.js @@ -39,11 +39,11 @@ App.MapReduce2ConfigsValidator = App.ServiceConfigsValidator.create({ configProperties: [], mapreduceMapJavaOpts: function(config) { - return this.validatorLessThenDefaultValue(config); + return null; }, mapreduceReduceJavaOpts: function(config) { - return this.validatorLessThenDefaultValue(config); + return null; }, mapreduceTaskIoSortMb: function(config) { @@ -63,7 +63,7 @@ App.MapReduce2ConfigsValidator = App.ServiceConfigsValidator.create({ }, yarnAppMapreduceAmCommandOpts: function(config) { - return this.validatorLessThenDefaultValue(config); + return null; } });
