You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/05/30 00:10:02 UTC
git commit: AMBARI-5948. Unable to Deploy Cluster After Wizard Step
7.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 0ba293c1e -> 48e3201ef
AMBARI-5948. Unable to Deploy Cluster After Wizard Step 7.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48e3201e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48e3201e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48e3201e
Branch: refs/heads/trunk
Commit: 48e3201efd5e9c486cabe17b5db68153ceb32f49
Parents: 0ba293c
Author: Xi Wang <xi...@apache.org>
Authored: Thu May 29 14:53:08 2014 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Thu May 29 15:09:03 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/48e3201e/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 b07ca74..0ce33b1 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.hostComponents[0].RootServiceHostComponents.properties);
+ var ambariDBInfo = JSON.stringify(data.RootServiceComponents.properties);
this.set('mySQLServerConflict', ambariDBInfo.indexOf('mysql') > 0 && ambariDBInfo.indexOf(hiveDBHostname) > 0);
},
@@ -975,12 +975,13 @@ App.WizardStep7Controller = Em.Controller.extend({
*/
submit: function () {
if (!this.get('isSubmitDisabled')) {
- var hiveDBType = this.get('stepConfigs').findProperty('serviceName', 'HIVE').configs.findProperty('name', 'hive_database').value;
- if (hiveDBType == 'New MySQL Database') {
+ // 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 self= this;
this.checkMySQLHost().done(function () {
if (self.get('mySQLServerConflict')) {
- // error popup before you can proceed
+ // hive New MySQL database is on the same host as Ambari server MySQL server, error popup before you can proceed
return App.ModalPopup.show({
header: Em.I18n.t('installer.step7.popup.mySQLWarning.header'),
bodyClass: Ember.View.extend({
@@ -1013,5 +1014,4 @@ App.WizardStep7Controller = Em.Controller.extend({
}
}
}
-
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/48e3201e/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 0cf3937..74fc79b 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=hostComponents/RootServiceHostComponents/properties/server.jdbc.database,hostComponents/RootServiceHostComponents/properties/server.jdbc.url',
+ 'real': '/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/properties/server.jdbc.database,RootServiceComponents/properties/server.jdbc.url',
'mock': '',
'format': function() {
return {