Переглянути джерело

AMBARI-7285. Incorrect default configuration for Storm in Ambari 1.6.1. (akovalenko)

Aleksandr Kovalenko 10 роки тому
батько
коміт
3cf2ee4d48

+ 6 - 2
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];