You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/05/16 16:28:20 UTC
ambari git commit: Revert "AMBARI-16683. Replace '*' to hdp version
in lzo packages (aonishuk)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 8fbedf2a7 -> 755cb1b8b
Revert "AMBARI-16683. Replace '*' to hdp version in lzo packages (aonishuk)"
This reverts commit 8fbedf2a74eb5f1a3e2a9277512d491025200e06.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/755cb1b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/755cb1b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/755cb1b8
Branch: refs/heads/branch-2.4
Commit: 755cb1b8b8010771ec6d099af931d8c6acf290b0
Parents: 8fbedf2
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon May 16 19:28:08 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon May 16 19:28:08 2016 +0300
----------------------------------------------------------------------
.../libraries/functions/get_lzo_packages.py | 8 +++-----
.../HDFS/2.1.0.2.0/package/scripts/install_params.py | 3 +--
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 3 +--
.../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 3 +--
4 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/755cb1b8/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
index 29712e3..e189d62 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
@@ -26,18 +26,16 @@ from resource_management.libraries.functions.stack_features import check_stack_f
from resource_management.libraries.functions import StackFeature
# TODO: Make list of lzo packages stack driven
-def get_lzo_packages(stack_version_unformatted, current_stack_full_version):
+def get_lzo_packages(stack_version_unformatted):
lzo_packages = []
- current_stack_full_version = current_stack_full_version.replace(".", "_")
- current_stack_full_version = current_stack_full_version.replace("-", "_")
-
+
if OSCheck.is_redhat_family() or OSCheck.is_suse_family():
lzo_packages += ["lzo", "hadoop-lzo-native"]
elif OSCheck.is_ubuntu_family():
lzo_packages += ["liblzo2-2"]
if stack_version_unformatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_unformatted):
- lzo_packages += ["hadooplzo_" + current_stack_full_version, "hadooplzo_" + current_stack_full_version + "-native"]
+ lzo_packages += ["hadooplzo_*"]
else:
lzo_packages += ["hadoop-lzo"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/755cb1b8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
index 18b1ac3..fe488c3 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
@@ -32,8 +32,7 @@ else:
# The logic for LZO also exists in OOZIE's params.py
io_compression_codecs = default("/configurations/core-site/io.compression.codecs", None)
lzo_enabled = io_compression_codecs is not None and "com.hadoop.compression.lzo" in io_compression_codecs.lower()
- current_stack_full_version = default("/hostLevelParams/current_version", None)
- lzo_packages = get_lzo_packages(stack_version_unformatted, current_stack_full_version)
+ lzo_packages = get_lzo_packages(stack_version_unformatted)
exclude_packages = []
if not lzo_enabled:
http://git-wip-us.apache.org/repos/asf/ambari/blob/755cb1b8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index 7019de0..784da9c 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -363,8 +363,7 @@ HdfsResource = functools.partial(
# The logic for LZO also exists in OOZIE's params.py
io_compression_codecs = default("/configurations/core-site/io.compression.codecs", None)
lzo_enabled = io_compression_codecs is not None and "com.hadoop.compression.lzo" in io_compression_codecs.lower()
-current_stack_full_version = default("/hostLevelParams/current_version", None)
-lzo_packages = get_lzo_packages(stack_version_unformatted, current_stack_full_version)
+lzo_packages = get_lzo_packages(stack_version_unformatted)
name_node_params = default("/commandParams/namenode", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/755cb1b8/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index bd20471..75924c5 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -285,5 +285,4 @@ is_webhdfs_enabled = config['configurations']['hdfs-site']['dfs.webhdfs.enabled'
io_compression_codecs = default("/configurations/core-site/io.compression.codecs", None)
lzo_enabled = io_compression_codecs is not None and "com.hadoop.compression.lzo" in io_compression_codecs.lower()
-current_stack_full_version = default("/hostLevelParams/current_version", None)
-all_lzo_packages = get_lzo_packages(stack_version_unformatted, current_stack_full_version)
+all_lzo_packages = get_lzo_packages(stack_version_unformatted)