Repository: ambari Updated Branches: refs/heads/trunk 9572882fd -> 5dd334c51
AMBARI-22467. YARN, MapReduce2, Hive, and Oozie Should Conditionally Install LZO (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5dd334c5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5dd334c5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5dd334c5 Branch: refs/heads/trunk Commit: 5dd334c513435717a7264f2092f5b281f5d2ce8f Parents: 9572882 Author: Andrew Onishuk <[email protected]> Authored: Wed Nov 22 16:36:51 2017 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Wed Nov 22 16:37:06 2017 +0200 ---------------------------------------------------------------------- .../common-services/DRUID/0.10.1/package/scripts/druid.py | 3 +-- .../common-services/DRUID/0.10.1/package/scripts/params.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5dd334c5/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py index ec98c3c..bb872b9 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py +++ b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py @@ -115,8 +115,7 @@ def druid(upgrade_type=None, nodeType=None): ) Logger.info(format("Created druid-{node_type_lowercase} jvm.config")) # Handling hadoop Lzo jars if enable and node type is hadoop related eg Overlords and MMs - if ['middleManager', 'overlord'].__contains__(node_type_lowercase) and params.lzo_enabled and len( - params.lzo_packages) > 0: + if ['middleManager', 'overlord'].__contains__(node_type_lowercase) and params.lzo_enabled: try: Logger.info( format( http://git-wip-us.apache.org/repos/asf/ambari/blob/5dd334c5/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py index fd1cde6..519dfbf 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py @@ -18,7 +18,6 @@ limitations under the License. """ from ambari_commons import OSCheck -from resource_management.libraries.functions.get_lzo_packages import get_lzo_packages from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import stack_select from resource_management.libraries.resources.hdfs_resource import HdfsResource @@ -27,6 +26,7 @@ from resource_management.libraries.script.script import Script from resource_management.libraries.functions import format from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources from resource_management.libraries.functions.default import default +from resource_management.libraries.functions.lzo_utils import should_install_lzo from ambari_commons.constants import AMBARI_SUDO_BINARY import status_params @@ -195,6 +195,5 @@ if has_metric_collector: # Create current Hadoop Clients Libs stack_version_unformatted = str(config['hostLevelParams']['stack_version']) 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() -lzo_packages = get_lzo_packages(stack_version_unformatted) +lzo_enabled = should_install_lzo() hadoop_lib_home = stack_root + '/' + stack_version + '/hadoop/lib'
