You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/08/13 19:01:02 UTC
ambari git commit: AMBARI-12766 Deployment on Ubuntu14 fails at Atlas
install (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk fd7bcd4e5 -> 288fffb70
AMBARI-12766 Deployment on Ubuntu14 fails at Atlas install (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/288fffb7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/288fffb7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/288fffb7
Branch: refs/heads/trunk
Commit: 288fffb702d6462b8945c97741777bf3975edee2
Parents: fd7bcd4
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Aug 13 20:00:50 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Aug 13 20:00:50 2015 +0300
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 2 ++
.../HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py | 5 +++--
.../resources/stacks/HDP/2.3/services/HIVE/metainfo.xml | 9 ++++++---
.../resources/stacks/HDP/2.4/services/HIVE/metainfo.xml | 9 ++++++---
4 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/288fffb7/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index de776a5..b78dd4b 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -383,9 +383,11 @@ atlas_hosts = default('/clusterHostInfo/atlas_server_hosts', [])
has_atlas = len(atlas_hosts) > 0
classpath_addition = ""
atlas_plugin_package = "atlas-metadata*-hive-plugin"
+atlas_ubuntu_plugin_package = "atlas-metadata.*-hive-plugin"
if not has_atlas:
hive_exclude_packages.append(atlas_plugin_package)
+ hive_exclude_packages.append(atlas_ubuntu_plugin_package)
else:
# hive-site
hive_site_config['atlas.cluster.name'] = config['clusterName']
http://git-wip-us.apache.org/repos/asf/ambari/blob/288fffb7/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
index 222a8c6..c92e3db 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_atlas_hive.py
@@ -21,6 +21,7 @@ limitations under the License.
from resource_management.libraries.resources.properties_file import PropertiesFile
from resource_management.core.resources.packaging import Package
from resource_management.libraries.functions.format import format
+from ambari_commons import OSCheck
def setup_atlas_hive(configuration_directory=None):
import params
@@ -30,11 +31,11 @@ def setup_atlas_hive(configuration_directory=None):
configuration_directory = format("{hive_config_dir}")
if not params.host_sys_prepped:
- Package(params.atlas_plugin_package, # FIXME HACK: install the package during RESTART/START when install_packages is not triggered.
+ Package(params.atlas_ubuntu_plugin_package if OSCheck.is_ubuntu_family() else params.atlas_plugin_package, # FIXME HACK: install the package during RESTART/START when install_packages is not triggered.
)
PropertiesFile(format('{configuration_directory}/client.properties'),
properties = params.atlas_client_props,
owner = params.hive_user,
group = params.user_group,
- mode = 0644)
\ No newline at end of file
+ mode = 0644)
http://git-wip-us.apache.org/repos/asf/ambari/blob/288fffb7/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml
----------------------------------------------------------------------
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 c505db4..b6b6bb8 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
@@ -30,9 +30,6 @@
<name>mysql-connector-java</name>
<skipUpgrade>true</skipUpgrade>
</package>
- <package>
- <name>atlas-metadata*-hive-plugin</name>
- </package>
</packages>
</osSpecific>
<osSpecific>
@@ -47,6 +44,9 @@
<package>
<name>hive_2_3_*-webhcat</name>
</package>
+ <package>
+ <name>atlas-metadata*-hive-plugin</name>
+ </package>
</packages>
</osSpecific>
<osSpecific>
@@ -83,6 +83,9 @@
<package>
<name>hive-2-3-.*-webhcat</name>
</package>
+ <package>
+ <name>atlas-metadata.*-hive-plugin</name>
+ </package>
</packages>
</osSpecific>
<osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/288fffb7/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
index 44774c2..ba4c71b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
@@ -30,9 +30,6 @@
<name>mysql-connector-java</name>
<skipUpgrade>true</skipUpgrade>
</package>
- <package>
- <name>atlas-metadata*-hive-plugin</name>
- </package>
</packages>
</osSpecific>
<osSpecific>
@@ -47,6 +44,9 @@
<package>
<name>hive_2_4_*-webhcat</name>
</package>
+ <package>
+ <name>atlas-metadata*-hive-plugin</name>
+ </package>
</packages>
</osSpecific>
<osSpecific>
@@ -83,6 +83,9 @@
<package>
<name>hive-2-4-.*-webhcat</name>
</package>
+ <package>
+ <name>atlas-metadata.*-hive-plugin</name>
+ </package>
</packages>
</osSpecific>
<osSpecific>