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 2014/11/01 19:11:24 UTC
git commit: AMBARI-8093 Change lzo jar name to hadooplzo-* (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 dd2a8895f -> 4390292b5
AMBARI-8093 Change lzo jar name to hadooplzo-* (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4390292b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4390292b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4390292b
Branch: refs/heads/branch-1.7.0
Commit: 4390292b5108f8d578f2f3982ae783b333aa7c85
Parents: dd2a889
Author: Dmytro Sen <ds...@apache.org>
Authored: Sat Nov 1 19:59:19 2014 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Sat Nov 1 20:10:21 2014 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent.ini | 2 --
.../src/main/python/ambari_agent/AmbariConfig.py | 1 -
.../HDP/2.0.6/services/HDFS/package/scripts/params.py | 12 +++++++-----
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 14 ++++----------
4 files changed, 11 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4390292b/ambari-agent/conf/unix/ambari-agent.ini
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent.ini b/ambari-agent/conf/unix/ambari-agent.ini
index 162041a..fc76d0e 100644
--- a/ambari-agent/conf/unix/ambari-agent.ini
+++ b/ambari-agent/conf/unix/ambari-agent.ini
@@ -48,7 +48,5 @@ dirs=/etc/hadoop,/etc/hadoop/conf,/etc/hbase,/etc/hcatalog,/etc/hive,/etc/oozie,
/var/run/hadoop,/var/run/zookeeper,/var/run/hbase,/var/run/templeton,/var/run/oozie,
/var/log/hadoop,/var/log/zookeeper,/var/log/hbase,/var/run/templeton,/var/log/hive,
/var/log/nagios
-rpms=nagios,ganglia,
- hadoop,hadoop-lzo,hbase,oozie,sqoop,pig,zookeeper,hive,libconfuse,ambari-log4j
; 0 - unlimited
log_lines_count=300
http://git-wip-us.apache.org/repos/asf/ambari/blob/4390292b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index 6e2ec84..ca2e80c 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -56,7 +56,6 @@ passphrase_env_var_name=AMBARI_PASSPHRASE
[heartbeat]
state_interval = 6
dirs=/etc/hadoop,/etc/hadoop/conf,/var/run/hadoop,/var/log/hadoop
-rpms=glusterfs,openssl,wget,net-snmp,ntpd,ganglia,nagios,glusterfs
log_lines_count=300
"""
http://git-wip-us.apache.org/repos/asf/ambari/blob/4390292b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
index 3570160..22ce519 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/params.py
@@ -27,8 +27,8 @@ import re
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
-hdp_stack_version = str(config['hostLevelParams']['stack_version'])
-hdp_stack_version = format_hdp_stack_version(hdp_stack_version)
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+hdp_stack_version = format_hdp_stack_version(stack_version_unformatted)
stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0
#hadoop params
@@ -209,11 +209,13 @@ HdfsDirectory = functools.partial(
io_compression_codecs = config['configurations']['core-site']['io.compression.codecs']
lzo_enabled = "com.hadoop.compression.lzo" in io_compression_codecs
+underscorred_version = stack_version_unformatted.replace('.', '_')
+dashed_version = stack_version_unformatted.replace('.', '-')
lzo_packages_to_family = {
"any": ["hadoop-lzo"],
- "redhat": ["lzo", "hadoop-lzo-native"],
- "suse": ["lzo", "hadoop-lzo-native"],
- "ubuntu": ["liblzo2-2"]
+ "redhat": ["lzo", "hadoop-lzo-native", format("hadooplzo_{underscorred_version}_*")],
+ "suse": ["lzo", "hadoop-lzo-native", format("hadooplzo_{underscorred_version}_*")],
+ "ubuntu": ["liblzo2-2", format("hadooplzo-{dashed_version}-.*")]
}
lzo_packages_for_current_host = lzo_packages_to_family['any'] + lzo_packages_to_family[System.get_instance().os_family]
all_lzo_packages = set(itertools.chain(*lzo_packages_to_family.values()))
http://git-wip-us.apache.org/repos/asf/ambari/blob/4390292b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
index 184e1cb..5d1fe99 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
@@ -25,15 +25,6 @@
<osSpecifics>
<osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>hadoop-lzo</name>
- </package>
- </packages>
- </osSpecific>
-
- <osSpecific>
<osFamily>redhat5,redhat6,suse11</osFamily>
<packages>
<package>
@@ -49,7 +40,7 @@
<name>lzo</name>
</package>
<package>
- <name>hadoop-lzo-native</name>
+ <name>hadooplzo_2_2_*</name>
</package>
<package>
<name>hadoop_2_2_*-libhdfs</name>
@@ -88,6 +79,9 @@
<name>libsnappy-dev</name>
</package>
<package>
+ <name>hadooplzo-2-2-.*</name>
+ </package>
+ <package>
<name>liblzo2-2</name>
</package>
<package>