You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2016/05/30 10:04:07 UTC
ambari git commit: AMBARI-16020 Hive Metastore install failed since
mysql-server not installed. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 8a1e89da5 -> f0411c9d9
AMBARI-16020 Hive Metastore install failed since mysql-server not installed. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0411c9d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0411c9d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0411c9d
Branch: refs/heads/branch-2.4
Commit: f0411c9d9b7f5f829c571b22f46573246c5f87f3
Parents: 8a1e89d
Author: Andrii Tkach <at...@apache.org>
Authored: Fri May 27 13:34:10 2016 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Mon May 30 13:03:52 2016 +0300
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.1/services/stack_advisor.py | 6 +++---
.../src/test/python/stacks/2.1/common/test_stack_advisor.py | 2 +-
ambari-web/app/controllers/wizard/step8_controller.js | 2 +-
ambari-web/test/controllers/wizard/step8_test.js | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0411c9d/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
index a46bd92..84a2476 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
@@ -88,9 +88,9 @@ class HDP21StackAdvisor(HDP206StackAdvisor):
if hiveEnvProperties and hiveSiteProperties and self.checkSiteProperties(hiveSiteProperties, 'javax.jdo.option.ConnectionDriverName') and self.checkSiteProperties(hiveEnvProperties, 'hive_database'):
putHiveProperty('javax.jdo.option.ConnectionDriverName', self.getDBDriver(hiveEnvProperties['hive_database']))
if hiveSiteProperties and hiveEnvProperties and self.checkSiteProperties(hiveSiteProperties, 'ambari.hive.db.schema.name', 'javax.jdo.option.ConnectionURL') and self.checkSiteProperties(hiveEnvProperties, 'hive_database'):
- hiveMSHost = self.getHostWithComponent('HIVE', 'HIVE_METASTORE', services, hosts)
- if hiveMSHost is not None:
- dbConnection = self.getDBConnectionString(hiveEnvProperties['hive_database']).format(hiveMSHost['Hosts']['host_name'], hiveSiteProperties['ambari.hive.db.schema.name'])
+ hiveServerHost = self.getHostWithComponent('HIVE', 'HIVE_SERVER', services, hosts)
+ if hiveServerHost is not None:
+ dbConnection = self.getDBConnectionString(hiveEnvProperties['hive_database']).format(hiveServerHost['Hosts']['host_name'], hiveSiteProperties['ambari.hive.db.schema.name'])
putHiveProperty('javax.jdo.option.ConnectionURL', dbConnection)
servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0411c9d/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
index 4a09f22..f1c93ca 100644
--- a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
@@ -184,7 +184,7 @@ class TestHDP21StackAdvisor(TestCase):
},
"components" : [ {
"StackServiceComponents" : {
- "component_name" : "HIVE_METASTORE",
+ "component_name" : "HIVE_SERVER",
"service_name" : "HIVE",
"hostnames" : ["example.com"]
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0411c9d/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index e2ba016..b236373 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1387,7 +1387,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
if (hiveService) {
var hiveDb = this.get('content.serviceConfigProperties').findProperty('name', 'hive_database');
if (hiveDb.value == "New MySQL Database") {
- this.registerHostsToComponent(masterHosts.filterProperty('component', 'HIVE_METASTORE').mapProperty('hostName'), 'MYSQL_SERVER');
+ this.registerHostsToComponent(masterHosts.filterProperty('component', 'HIVE_SERVER').mapProperty('hostName'), 'MYSQL_SERVER');
} else if (hiveDb.value === "New PostgreSQL Database") {
this.registerHostsToComponent(masterHosts.filterProperty('component', 'HIVE_SERVER').mapProperty('hostName'), 'POSTGRESQL_SERVER');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0411c9d/ambari-web/test/controllers/wizard/step8_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js
index ccd60f4..74e042b 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -1338,7 +1338,7 @@ describe('App.WizardStep8Controller', function () {
{
name: 'New MySQL Database',
component: 'MYSQL_SERVER',
- expectedHosts: ['h1']
+ expectedHosts: ['h2']
},
{
name: 'New PostgreSQL Database',