Repository: ambari Updated Branches: refs/heads/trunk 6826ef4c3 -> 6962851fd
Revert "AMBARI-5948. Unable to Deploy Cluster After Wizard Step 7.(xiwang)" This reverts commit 48e3201efd5e9c486cabe17b5db68153ceb32f49. This is done to commit AMBARI-5951 which addresses the same issue for both installer and add service wizard. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb77bc4b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb77bc4b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb77bc4b Branch: refs/heads/trunk Commit: fb77bc4b9f4ec64f787cdc24f3111c8adc42ae41 Parents: 6826ef4 Author: Jaimin Jetly <[email protected]> Authored: Thu May 29 15:57:16 2014 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Thu May 29 15:57:16 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 10 +++++----- ambari-web/app/utils/ajax/ajax.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fb77bc4b/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 0ce33b1..b07ca74 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -965,7 +965,7 @@ App.WizardStep7Controller = Em.Controller.extend({ */ getAmbariDatabaseSuccess: function (data) { var hiveDBHostname = this.get('stepConfigs').findProperty('serviceName', 'HIVE').configs.findProperty('name', 'hivemetastore_host').value; - var ambariDBInfo = JSON.stringify(data.RootServiceComponents.properties); + var ambariDBInfo = JSON.stringify(data.hostComponents[0].RootServiceHostComponents.properties); this.set('mySQLServerConflict', ambariDBInfo.indexOf('mysql') > 0 && ambariDBInfo.indexOf(hiveDBHostname) > 0); }, @@ -975,13 +975,12 @@ App.WizardStep7Controller = Em.Controller.extend({ */ submit: function () { if (!this.get('isSubmitDisabled')) { - // if Hive selected, then check mySQLsevers conflict issue: whether hive New MySQL database is on the same host as Ambari server MySQL server - if (this.get('stepConfigs').findProperty('serviceName', 'HIVE') && - this.get('stepConfigs').findProperty('serviceName', 'HIVE').configs.findProperty('name', 'hive_database').value == 'New MySQL Database') { + var hiveDBType = this.get('stepConfigs').findProperty('serviceName', 'HIVE').configs.findProperty('name', 'hive_database').value; + if (hiveDBType == 'New MySQL Database') { var self= this; this.checkMySQLHost().done(function () { if (self.get('mySQLServerConflict')) { - // hive New MySQL database is on the same host as Ambari server MySQL server, error popup before you can proceed + // error popup before you can proceed return App.ModalPopup.show({ header: Em.I18n.t('installer.step7.popup.mySQLWarning.header'), bodyClass: Ember.View.extend({ @@ -1014,4 +1013,5 @@ App.WizardStep7Controller = Em.Controller.extend({ } } } + }); http://git-wip-us.apache.org/repos/asf/ambari/blob/fb77bc4b/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 74fc79b..0cf3937 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -358,7 +358,7 @@ var urls = { } }, 'config.ambari.database.info': { - 'real': '/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/properties/server.jdbc.database,RootServiceComponents/properties/server.jdbc.url', + 'real': '/services/AMBARI/components/AMBARI_SERVER?fields=hostComponents/RootServiceHostComponents/properties/server.jdbc.database,hostComponents/RootServiceHostComponents/properties/server.jdbc.url', 'mock': '', 'format': function() { return {
