This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new ac7dee0 AMBARI-23149. Installation of MySQL fails on CentOS 7.2,
should install mariadb (aonishuk)
ac7dee0 is described below
commit ac7dee0a3f4efa72203d04b4ce814e4d1112e9b7
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Tue Mar 6 15:23:15 2018 +0200
AMBARI-23149. Installation of MySQL fails on CentOS 7.2, should install
mariadb (aonishuk)
---
.../main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml | 7 +------
.../HIVE/0.12.0.2.0/package/scripts/mysql_service.py | 9 +++++----
.../HIVE/0.12.0.2.0/package/scripts/status_params.py | 3 ++-
.../src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml | 7 +------
.../src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml | 7 +------
.../src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml | 7 +------
.../src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml | 7 +------
7 files changed, 12 insertions(+), 35 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
index 4c8aca1..03187c8 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
@@ -301,12 +301,7 @@
<osFamily>redhat7</osFamily>
<packages>
<package>
- <name>mysql-community-release</name>
- <skipUpgrade>true</skipUpgrade>
- <condition>should_install_mysql</condition>
- </package>
- <package>
- <name>mysql-community-server</name>
+ <name>mariadb-server</name>
<skipUpgrade>true</skipUpgrade>
<condition>should_install_mysql</condition>
</package>
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
index fe6d7b9..5a9173b 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/mysql_service.py
@@ -27,10 +27,11 @@ from resource_management.libraries.functions.format import
format
def get_daemon_name():
import status_params
- for possible_daemon_name in status_params.POSSIBLE_DAEMON_NAMES:
- daemon_path = os.path.join(status_params.SERVICES_DIR,
possible_daemon_name)
- if os.path.exists(daemon_path):
- return possible_daemon_name
+ for service_file_template in status_params.SERVICE_FILE_TEMPLATES:
+ for possible_daemon_name in status_params.POSSIBLE_DAEMON_NAMES:
+ daemon_path = service_file_template.format(possible_daemon_name)
+ if os.path.exists(daemon_path):
+ return possible_daemon_name
raise Fail("Could not find service daemon for mysql")
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
index 860f8ac..77c9368 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
@@ -69,7 +69,8 @@ else:
webhcat_pid_file = format('{hcat_pid_dir}/webhcat.pid')
process_name = 'mysqld'
- SERVICES_DIR = '/etc/init.d'
+
+ SERVICE_FILE_TEMPLATES = ['/etc/init.d/{0}',
'/usr/lib/systemd/system/{0}.service']
POSSIBLE_DAEMON_NAMES = ['mysql', 'mysqld', 'mariadb']
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
index f3eaa8c..9ef3a9a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
@@ -70,12 +70,7 @@
<osFamily>redhat7</osFamily>
<packages>
<package>
- <name>mysql-community-release</name>
- <skipUpgrade>true</skipUpgrade>
- <condition>should_install_mysql</condition>
- </package>
- <package>
- <name>mysql-community-server</name>
+ <name>mariadb-server</name>
<skipUpgrade>true</skipUpgrade>
<condition>should_install_mysql</condition>
</package>
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
index 49a4e69..961fcb0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
@@ -84,12 +84,7 @@
<osFamily>redhat7</osFamily>
<packages>
<package>
- <name>mysql-community-release</name>
- <skipUpgrade>true</skipUpgrade>
- <condition>should_install_mysql</condition>
- </package>
- <package>
- <name>mysql-community-server</name>
+ <name>mariadb-server</name>
<skipUpgrade>true</skipUpgrade>
<condition>should_install_mysql</condition>
</package>
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml
index 53b8dd0..7980721 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml
@@ -55,12 +55,7 @@
<osFamily>redhat7</osFamily>
<packages>
<package>
- <name>mysql-community-release</name>
- <skipUpgrade>true</skipUpgrade>
- <condition>should_install_mysql</condition>
- </package>
- <package>
- <name>mysql-community-server</name>
+ <name>mariadb-server</name>
<skipUpgrade>true</skipUpgrade>
<condition>should_install_mysql</condition>
</package>
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
index fb72d98..1ca6933 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
@@ -179,12 +179,7 @@
<osFamily>redhat7</osFamily>
<packages>
<package>
- <name>mysql-community-release</name>
- <skipUpgrade>true</skipUpgrade>
- <condition>should_install_mysql</condition>
- </package>
- <package>
- <name>mysql-community-server</name>
+ <name>mariadb-server</name>
<skipUpgrade>true</skipUpgrade>
<condition>should_install_mysql</condition>
</package>
--
To stop receiving notification emails like this one, please contact
aonis...@apache.org.
