Updated Branches: refs/heads/trunk c24508645 -> 712134b24
AMBARI-3737 HBase -> Configs -> RegionServer -> HBase RegionServers maximum Java heap size: adding Exception fails. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/712134b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/712134b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/712134b2 Branch: refs/heads/trunk Commit: 712134b245d6b3182c326da2cd6bec326fc6d134 Parents: c245086 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Mon Nov 11 18:11:39 2013 +0200 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Mon Nov 11 18:13:57 2013 +0200 ---------------------------------------------------------------------- .../controllers/main/service/info/configs.js | 72 +++++++++----------- 1 file changed, 31 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/712134b2/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 994ead5..29f6a94 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -1357,33 +1357,29 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ }, recordHostOverride: function (serviceConfigObj, siteName, tagName, self) { + var overrides = null; + var name = ''; if ('get' in serviceConfigObj) { - return this._recordHostOverrideFromEmberObj(serviceConfigObj, siteName, tagName, self); + overrides = serviceConfigObj.get('overrides'); + name = serviceConfigObj.get('name'); } else { - return this._recordHostOverrideFromObj(serviceConfigObj, siteName, tagName, self); + overrides = serviceConfigObj.overrides; + name = serviceConfigObj.name; } - }, - - /** - * Records all the host overrides per site/tag - */ - _recordHostOverrideFromObj: function (serviceConfigObj, siteName, tagName, self) { - var overrides = serviceConfigObj.overrides; - if (overrides) { - for (var value in overrides) { - overrides[value].forEach(function (host) { - if (!(host in self.savedHostToOverrideSiteToTagMap)) { - self.savedHostToOverrideSiteToTagMap[host] = {}; - } - if (!(siteName in self.savedHostToOverrideSiteToTagMap[host])) { - self.savedHostToOverrideSiteToTagMap[host][siteName] = {}; - self.savedHostToOverrideSiteToTagMap[host][siteName].map = {}; - } - var finalTag = tagName + '_' + host; - console.log("recordHostOverride(): Saving host override for host=" + host + ", site=" + siteName + ", tag=" + finalTag + ", (key,value)=(" + serviceConfigObj.name + "," + value + ")"); - self.savedHostToOverrideSiteToTagMap[host][siteName].tagName = finalTag; - self.savedHostToOverrideSiteToTagMap[host][siteName].map[serviceConfigObj.name] = value; + if(overrides){ + if('get' in overrides) { + overrides.forEach(function (override) { + override.get('selectedHostOptions').forEach(function (host) { + var value = override.get('value'); + self._recordHostOverride(value, host, name, siteName, tagName, self); + }); }); + } else { + for (var value in overrides) { + overrides[value].forEach(function (host) { + self._recordHostOverride(value, host, name, siteName, tagName, self); + }); + } } } }, @@ -1391,25 +1387,19 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ /** * Records all the host overrides per site/tag */ - _recordHostOverrideFromEmberObj: function (serviceConfigObj, siteName, tagName, self) { - var overrides = serviceConfigObj.get('overrides'); - if (overrides) { - overrides.forEach(function (override) { - override.get('selectedHostOptions').forEach(function (host) { - if (!(host in self.savedHostToOverrideSiteToTagMap)) { - self.savedHostToOverrideSiteToTagMap[host] = {}; - } - if (!(siteName in self.savedHostToOverrideSiteToTagMap[host])) { - self.savedHostToOverrideSiteToTagMap[host][siteName] = {}; - self.savedHostToOverrideSiteToTagMap[host][siteName].map = {}; - } - var finalTag = tagName + '_' + host; - console.log("recordHostOverride(): Saving host override for host=" + host + ", site=" + siteName + ", tag=" + finalTag + ", (key,value)=(" + serviceConfigObj.name + "," + override.get('value') + ")"); - self.savedHostToOverrideSiteToTagMap[host][siteName].tagName = finalTag; - self.savedHostToOverrideSiteToTagMap[host][siteName].map[serviceConfigObj.name] = override.get('value'); - }); - }); + + _recordHostOverride: function(value, host, serviceConfigObjName, siteName, tagName, self) { + if (!(host in self.savedHostToOverrideSiteToTagMap)) { + self.savedHostToOverrideSiteToTagMap[host] = {}; + } + if (!(siteName in self.savedHostToOverrideSiteToTagMap[host])) { + self.savedHostToOverrideSiteToTagMap[host][siteName] = {}; + self.savedHostToOverrideSiteToTagMap[host][siteName].map = {}; } + var finalTag = tagName + '_' + host; + console.log("recordHostOverride(): Saving host override for host=" + host + ", site=" + siteName + ", tag=" + finalTag + ", (key,value)=(" + serviceConfigObjName + "," + value + ")"); + self.savedHostToOverrideSiteToTagMap[host][siteName].tagName = finalTag; + self.savedHostToOverrideSiteToTagMap[host][siteName].map[serviceConfigObjName] = value; }, /**
