ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-18173. HSI is not started even when "Enable Interactive Query" is set to Yes on installer wizard. (jaimin)
Date Wed, 17 Aug 2016 04:09:02 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 434576961 -> 1b5e1c01a


AMBARI-18173. HSI is not started even when "Enable Interactive Query" is set to Yes on installer
wizard. (jaimin)


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

Branch: refs/heads/trunk
Commit: 1b5e1c01a97489db90cbcaeaff2876ffa8e454ea
Parents: 4345769
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Tue Aug 16 21:06:11 2016 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Tue Aug 16 21:09:08 2016 -0700

----------------------------------------------------------------------
 .../app/controllers/wizard/step7/assign_master_controller.js     | 2 +-
 ambari-web/app/routes/installer.js                               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b5e1c01/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index 1d21b62..399000e 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -292,7 +292,7 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
     var controller = App.router.get(this.get('content.controllerName'));
     var componentsFromConfigs = this.get('content.componentsFromConfigs');
     controller.saveMasterComponentHosts(this, true);
-    controller.loadMasterComponentHosts();
+    controller.loadMasterComponentHosts(true);
     componentsFromConfigs = componentsFromConfigs.concat(this.get('mastersToCreate'));
     this.set('content.componentsFromConfigs', componentsFromConfigs);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b5e1c01/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 5b00aa2..0cfbf20 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -422,8 +422,8 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
         controller.saveServiceConfigGroups(wizardStep7Controller);
         controller.setDBProperty('recommendationsConfigs', wizardStep7Controller.get('recommendationsConfigs'));
         controller.saveComponentsFromConfigs(controller.get('content.componentsFromConfigs'));
-        controller.setDBProperty('recommendationsHostGroup', wizardStep7Controller.get('recommendationsHostGroup'));
-        controller.setDBProperty('masterComponentHosts', wizardStep7Controller.get('masterComponentHosts'));
+        controller.setDBProperty('recommendationsHostGroup', wizardStep7Controller.get('content.recommendationsHostGroup'));
+        controller.setDBProperty('masterComponentHosts', wizardStep7Controller.get('content.masterComponentHosts'));
         router.transitionTo('step8');
         console.timeEnd('step7 next');
       }


Mime
View raw message