ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [23/30] git commit: AMBARI-7285. Incorrect default configuration for Storm in Ambari 1.6.1. (akovalenko)
Date Fri, 12 Sep 2014 23:53:51 GMT
AMBARI-7285. Incorrect default configuration for Storm in Ambari 1.6.1. (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3cf2ee4d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3cf2ee4d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3cf2ee4d

Branch: refs/heads/branch-alerts-dev
Commit: 3cf2ee4d483091519279cc9f0e9db5a7fce2eb71
Parents: 2a7fb78
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Fri Sep 12 20:01:23 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Fri Sep 12 20:01:23 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step7_controller.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3cf2ee4d/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 3ad55d3..45647bb 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -674,12 +674,16 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin,
{
    * @method resolveStormConfigs
    */
   resolveStormConfigs: function (configs) {
-    var dependentConfigs, gangliaServerHost;
+    var dependentConfigs, gangliaServerHost, gangliaHostId, hosts;
     dependentConfigs = ['nimbus.childopts', 'supervisor.childopts', 'worker.childopts'];
     // if Ganglia selected or installed, set ganglia host to configs
     if (this.get('installedServiceNames').contains('STORM') && this.get('installedServiceNames').contains('GANGLIA'))
return;
     if (this.get('allSelectedServiceNames').contains('GANGLIA') || this.get('installedServiceNames').contains('GANGLIA'))
{
-      gangliaServerHost = this.get('wizardController').getDBProperty('masterComponentHosts').findProperty('component',
'GANGLIA_SERVER').hostName;
+      hosts = this.get('wizardController').getDBProperty('hosts');
+      gangliaHostId = this.get('wizardController').getDBProperty('masterComponentHosts').findProperty('component',
'GANGLIA_SERVER').host_id;
+      for (var hostName in hosts) {
+        if (hosts[hostName].id == gangliaHostId) gangliaServerHost = hosts[hostName].name;
+      }
       dependentConfigs.forEach(function (configName) {
         var config = configs.findProperty('name', configName);
         var replaceStr = config.value.match(/.jar=host[^,]+/)[0];


Mime
View raw message