Repository: ambari Updated Branches: refs/heads/trunk dfc023bb2 -> 343d41ef5
AMBARI-5159. Storm config page not available(ui.childopts property missing post-installation). (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/343d41ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/343d41ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/343d41ef Branch: refs/heads/trunk Commit: 343d41ef5bbb90506ecfc92f6c558f81a021b8e8 Parents: dfc023b Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Mon Mar 24 15:49:05 2014 -0700 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Mon Mar 24 15:49:05 2014 -0700 ---------------------------------------------------------------------- .../app/controllers/main/service/info/configs.js | 14 +++++++++++--- ambari-web/app/utils/config.js | 9 +++++++-- .../defaults_providers/storm_defaults_provider.js | 4 ---- 3 files changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/343d41ef/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 beac1b7..6282887 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -380,7 +380,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ this.checkForRestart(serviceConfig, restartData); if (serviceName || serviceConfig.serviceName === 'MISC') { //STEP 11: render configs and wrap each in ServiceConfigProperty object - this.loadComponentConfigs(allConfigs, serviceConfig, restartData); + this.loadComponentConfigs(allConfigs, serviceConfig, restartData, advancedConfigs); this.get('stepConfigs').pushObject(serviceConfig); } this.set('selectedService', this.get('stepConfigs').objectAt(0)); @@ -524,8 +524,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ * @param configs * @param componentConfig * @param restartData + * @param advancedConfigs */ - loadComponentConfigs: function (configs, componentConfig, restartData) { + loadComponentConfigs: function (configs, componentConfig, restartData, advancedConfigs) { var localDB = this.getInfoForDefaults(); var recommendedDefaults = {}; @@ -537,7 +538,14 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ var d = defaultsProvider.getDefaults(localDB); defaults.push(d); for (var name in d) { - recommendedDefaults[name] = d[name]; + var defaultValueFromStack = advancedConfigs.findProperty('name',name); + if (!!d[name]) { + recommendedDefaults[name] = d[name]; + } else { + // If property default value is not declared on client, fetch it from stack definition + // If it's not declared with any valid value in both server stack and client, then js reference error is expected to be thrown + recommendedDefaults[name] = defaultValueFromStack.value + } } }); } http://git-wip-us.apache.org/repos/asf/ambari/blob/343d41ef/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 8f74043..90ab28f 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -616,11 +616,16 @@ App.config = Em.Object.create({ service.defaultsProviders.forEach(function (defaultsProvider) { var defaults = defaultsProvider.getDefaults(localDB); for (var name in defaults) { - recommendedDefaults[name] = defaults[name]; var config = configsByService.findProperty('name', name); - if (config) { + if (!config) { + continue; + } + if (!!defaults[name]) { + recommendedDefaults[name] = defaults[name]; config.set('value', defaults[name]); config.set('defaultValue', defaults[name]); + } else { + recommendedDefaults[name] = config.get('defaultValue'); } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/343d41ef/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js b/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js index e49e282..2acf89a 100644 --- a/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js +++ b/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js @@ -40,10 +40,6 @@ App.STORMDefaultsProvider = App.DefaultsProvider.extend({ if (!this.clusterDataIsValid()) { return configs; } - configs['drpc.childopts'] = '-Xmx768m'; - //ui childopts value should be taken from stack - //configs['ui.childopts'] = '-Xmx768m'; - configs['logviewer.childopts'] = '-Xmx128m'; return configs; },
