Repository: ambari Updated Branches: refs/heads/trunk c67a3246e -> 8fe6ac4bd
AMBARI-22445. Warn the user appropriately for default MySQL server install for Hive (vsubramanian) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fe6ac4b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fe6ac4b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fe6ac4b Branch: refs/heads/trunk Commit: 8fe6ac4bd03739202a35f8862270be7dcec95421 Parents: c67a324 Author: Vivek Ratnavel Subramanian <vivekratnave...@gmail.com> Authored: Wed Nov 15 14:28:22 2017 -0800 Committer: Vivek Ratnavel Subramanian <vivekratnave...@gmail.com> Committed: Wed Nov 15 14:28:22 2017 -0800 ---------------------------------------------------------------------- ambari-web/app/views/common/controls_view.js | 9 +++++++-- ambari-web/test/views/common/controls_view_test.js | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe6ac4b/ambari-web/app/views/common/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js index 530b60a..63d08ce 100644 --- a/ambari-web/app/views/common/controls_view.js +++ b/ambari-web/app/views/common/controls_view.js @@ -543,8 +543,8 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId, if ((App.get('isHadoopWindowsStack') && this.get('inMSSQLWithIA')) || this.get('serviceConfig.name') === 'DB_FLAVOR') { this.onOptionsChange(); } - this.handleDBConnectionProperty(); } + this.handleDBConnectionProperty(); } }, @@ -748,6 +748,11 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId, // check for all db types when installing Ranger - not only for existing ones checkDatabase = true; } + // Hive specific + if (this.get('serviceConfig.serviceName') === 'HIVE') { + // check for all db types when installing Hive - not only for existing ones + checkDatabase = true; + } if (propertyAppendTo1) { propertyAppendTo1.set('additionalView', null); } @@ -757,7 +762,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend(App.ServiceConfigCalculateId, var shouldAdditionalViewsBeSet = currentDB && checkDatabase && handledProperties.contains(this.get('serviceConfig.name')), driver = this.getDefaultPropertyValue('sql_jar_connector') ? this.getDefaultPropertyValue('sql_jar_connector').split("/").pop() : 'driver.jar', dbType = this.getDefaultPropertyValue('db_type'), - additionalView1 = shouldAdditionalViewsBeSet ? App.CheckDBConnectionView.extend({databaseName: dbType}) : null, + additionalView1 = shouldAdditionalViewsBeSet && !this.get('isNewDb') ? App.CheckDBConnectionView.extend({databaseName: dbType}) : null, additionalView2 = shouldAdditionalViewsBeSet ? Ember.View.extend({ template: Ember.Handlebars.compile('<div class="alert alert-warning">{{{view.message}}}</div>'), message: function() { http://git-wip-us.apache.org/repos/asf/ambari/blob/8fe6ac4b/ambari-web/test/views/common/controls_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/common/controls_view_test.js b/ambari-web/test/views/common/controls_view_test.js index 17dd6e1..76742fa 100644 --- a/ambari-web/test/views/common/controls_view_test.js +++ b/ambari-web/test/views/common/controls_view_test.js @@ -59,7 +59,7 @@ describe('App.ServiceConfigRadioButtons', function () { propertyAppendTo1: 'javax.jdo.option.ConnectionURL', propertyAppendTo2: 'hive_database', isAdditionalView1Null: true, - isAdditionalView2Null: true, + isAdditionalView2Null: false, title: 'Hive, embedded database' }, {