You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/08/31 12:37:21 UTC
ambari git commit: AMBARI-12933 Add Oozie service broken. Hangs on
Customize service step. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 8afe0fc5d -> bd0ff5a7e
AMBARI-12933 Add Oozie service broken. Hangs on Customize service step. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd0ff5a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd0ff5a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd0ff5a7
Branch: refs/heads/branch-2.1
Commit: bd0ff5a7e9f476c898c6b1fd73419376c51548bf
Parents: 8afe0fc
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Aug 31 13:32:55 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Aug 31 13:32:55 2015 +0300
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 31 ----------------
.../test/controllers/wizard/step7_test.js | 37 --------------------
2 files changed, 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd0ff5a7/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 db8db19..2607b89 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -928,7 +928,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
delete configsMap[type][_config.name];
}
});
- self.setServiceDatabaseConfigs(configs);
//add user properties
Em.keys(configsMap).forEach(function (filename) {
@@ -954,36 +953,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
},
/**
- * Check if Oozie or Hive use existing database then need
- * to restore missed properties
- *
- * @param {Object[]} configs
- **/
- setServiceDatabaseConfigs: function (configs) {
- var serviceNames = this.get('installedServiceNames').filter(function (serviceName) {
- return ['OOZIE', 'HIVE'].contains(serviceName);
- });
- serviceNames.forEach(function (serviceName) {
- var propertyPrefix = serviceName.toLowerCase();
- var dbTypeConfig = configs.findProperty('name', propertyPrefix + '_database');
- if (!/existing/gi.test(dbTypeConfig.value)) return;
- var dbHostName = propertyPrefix + '_hostname';
- var database = dbTypeConfig.value.match(/MySQL|PostgreSQL|Oracle|Derby|MSSQL/gi)[0];
- var dbPrefix = database.toLowerCase();
- if (database.toLowerCase() == 'mssql') {
- if (/integrated/gi.test(dbTypeConfig.value)) {
- dbPrefix = 'mssql_server_2';
- } else {
- dbPrefix = 'mssql_server';
- }
- }
- var propertyName = propertyPrefix + '_existing_' + dbPrefix + '_host';
- var existingDBConfig = configs.findProperty('name', propertyName);
- if (existingDBConfig && !existingDBConfig.value)
- existingDBConfig.value = existingDBConfig.savedValue = configs.findProperty('name', dbHostName).value;
- }, this);
- },
- /**
* Add group ids to <code>groupsToDelete</code>
* Also save <code>groupsToDelete</code> to local storage
* @param {Ember.Object[]} groups
http://git-wip-us.apache.org/repos/asf/ambari/blob/bd0ff5a7/ambari-web/test/controllers/wizard/step7_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index f1770a4..c0e820f 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1702,43 +1702,6 @@ describe('App.InstallerStep7Controller', function () {
});
- describe('#setServiceDatabaseConfigs', function () {
-
- var controller = App.WizardStep7Controller.create({
- installedServiceNames: ['OOZIE', 'HIVE']
- });
- var configs = [
- {
- name: 'hive_database',
- value: 'MySQL',
- serviceName: 'HIVE',
- filename: 'hbase-site.xml'
- },
- {
- name: 'oozie_database',
- value: 'MySQL',
- serviceName: 'OOZIE',
- filename: 'ams-hbase-site.xml'
- }
- ];
-
- it('should handle properties with the same name', function () {
- var services = Em.A([
- Em.Object.create({
- isInstalled: true,
- serviceName: 'SQOOP'
- }),
- Em.Object.create({
- isInstalled: true,
- serviceName: 'HDFS'
- })
- ]);
- controller.setServiceDatabaseConfigs(configs);
- var properties = configs.filterProperty('name', 'hive_database');
- expect(properties).to.have.length(1);
- });
- });
-
describe('#getAmbariDatabaseSuccess', function () {
var controller = App.WizardStep7Controller.create({