You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 05:53:38 UTC
svn commit: r1347371 - in /incubator/ambari/branches/ambari-186: ./
hmc/php/puppet/genmanifest/ hmc/puppet/modules/hdp/manifests/
hmc/puppet/modules/hdp/manifests/lzo/
Author: vikram
Date: Thu Jun 7 03:53:38 2012
New Revision: 1347371
URL: http://svn.apache.org/viewvc?rev=1347371&view=rev
Log:
AMBARI-521. Lzo Install with RPM's. (Contributed by Ramya)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/lzo/package.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347371&r1=1347370&r2=1347371&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 03:53:38 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-521. Lzo Install with RPM's. (Ramya via Vikram)
+
AMBARI-520. Disable all debug console logging on the browser (Yusaku via Vikram)
AMBARI-517. Dashboard shows HDFS is down though it's still running (Suhas via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php?rev=1347371&r1=1347370&r2=1347371&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/genmanifest/generateManifest.php Thu Jun 7 03:53:38 2012
@@ -201,12 +201,12 @@ include "RoleDependencies.php";
}
private static $rolesToPackageMap = array (
- "hdp-hadoop::namenode" => "hadoop hadoop-libhdfs.x86_64 hadoop-native.x86_64 hadoop-pipes.x86_64 hadoop-sbin.x86_64",
- "hdp-hadoop::snamenode" => "hadoop hadoop-libhdfs.x86_64 hadoop-native.x86_64 hadoop-pipes.x86_64 hadoop-sbin.x86_64",
- "hdp-hadoop::jobtracker" => "hadoop hadoop-libhdfs.x86_64 hadoop-native.x86_64 hadoop-pipes.x86_64 hadoop-sbin.x86_64",
- "hdp-hadoop::client" => "hadoop hadoop-libhdfs.i386 hadoop-native.i386 hadoop-pipes.i386 hadoop-sbin.i386",
- "hdp-hadoop::datanode" => "hadoop hadoop-libhdfs.i386 hadoop-native.i386 hadoop-pipes.i386 hadoop-sbin.i386",
- "hdp-hadoop::tasktracker" => "hadoop hadoop-libhdfs.i386 hadoop-native.i386 hadoop-pipes.i386 hadoop-sbin.i386",
+ "hdp-hadoop::namenode" => "hadoop hadoop-libhdfs.x86_64 hadoop-native.x86_64 hadoop-pipes.x86_64 hadoop-sbin.x86_64 hadoop-lzo",
+ "hdp-hadoop::snamenode" => "hadoop hadoop-libhdfs.x86_64 hadoop-native.x86_64 hadoop-pipes.x86_64 hadoop-sbin.x86_64 hadoop-lzo",
+ "hdp-hadoop::jobtracker" => "hadoop hadoop-libhdfs.x86_64 hadoop-native.x86_64 hadoop-pipes.x86_64 hadoop-sbin.x86_64 hadoop-lzo",
+ "hdp-hadoop::client" => "hadoop hadoop-libhdfs.i386 hadoop-native.i386 hadoop-pipes.i386 hadoop-sbin.i386 hadoop-lzo",
+ "hdp-hadoop::datanode" => "hadoop hadoop-libhdfs.i386 hadoop-native.i386 hadoop-pipes.i386 hadoop-sbin.i386 hadoop-lzo",
+ "hdp-hadoop::tasktracker" => "hadoop hadoop-libhdfs.i386 hadoop-native.i386 hadoop-pipes.i386 hadoop-sbin.i386 hadoop-lzo",
"hdp-zookeeper" => "zookeeper",
"hdp-zookeeper::client" => "zookeeper",
"hdp-hbase::master" => "hbase",
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp?rev=1347371&r1=1347370&r2=1347371&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp Thu Jun 7 03:53:38 2012
@@ -30,7 +30,6 @@ class hdp(
if ($hdp::params::lzo_enabled == true) {
@hdp::lzo::package{ 32:}
@hdp::lzo::package{ 64:}
- hdp::artifact_dir { 'hdp::lzo::package::tar':}
}
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/lzo/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/lzo/package.pp?rev=1347371&r1=1347370&r2=1347371&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/lzo/package.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/lzo/package.pp Thu Jun 7 03:53:38 2012
@@ -7,63 +7,8 @@ define hdp::lzo::package()
java_needed => false
}
- hdp::lzo::package::tar { $size:}
-
$anchor_beg = "hdp::lzo::package::${size}::begin"
$anchor_end = "hdp::lzo::package::${size}::end"
anchor{$anchor_beg:} -> Hdp::Package["lzo ${size}"] -> anchor{$anchor_end:}
- Anchor[$anchor_beg] -> Hdp::Lzo::Package::Tar[$size] -> Anchor[$anchor_end]
}
-define hdp::lzo::package::tar()
-{
- $size = $name
-
- $hadoop_home = $hdp::params::hadoop_home
- $lzo_tar_name = $hdp::params::lzo_tar_name
- $lzo_tar_gz = "${lzo_tar_name}.tar.gz"
- $artifact_dir = $hdp::params::artifact_dir
- $artifacts_download_url = $hdp::params::apache_artifacts_download_url
- $lzo_curl_target = "${artifact_dir}/${lzo_tar_gz}"
- $lzo_dir = "${artifact_dir}/${lzo_tar_name}"
- $lzo_jar = "${lzo_tar_name}.jar"
-
- $curl_cmd = "mkdir -p ${artifact_dir} ; curl -f --retry 10 ${artifacts_download_url}/${lzo_tar_gz} -o ${lzo_curl_target}"
- $untar_cmd = "tar xzf ${artifact_dir}/${lzo_tar_gz}"
-
- ### compute $install_cmd
- $install_dir = $hdp::params::lzo_compression_so_dirs[$size]
- if ($size == 32) {
- $linux = "Linux-i386-32"
- } else {
- $linux = "Linux-amd64-64"
- }
- $jar_target_dir = "${hadoop_home}/lib/hadoop/lib"
- $install_cmd_cp1 = "mkdir -p ${jar_target_dir};cp -f ${lzo_dir}/${lzo_jar} ${jar_target_dir}"
- $install_cmd_rm = "rm -f ${install_dir}/libgplcompression*"
- $install_mkdir = "mkdir -p ${install_dir}"
- $install_cmd_cp2 = "cp ${lzo_dir}/lib/native/${linux}/libgplcompression* ${install_dir}"
- $install_cmd = "${install_cmd_cp1}; ${install_cmd_rm}; ${install_mkdir}; ${install_cmd_cp2}"
- ### end: compute $install_cmd
-
- hdp::exec{ "hdp::lzo::package::tar curl_cmd ${name}":
- command => $curl_cmd,
- creates => $lzo_curl_target
- }
-
- hdp::exec{ "hdp::lzo::package::tar untar_cmd ${name}":
- command => $untar_cmd,
- cwd => $artifact_dir,
- creates => "${lzo_dir}/${lzo_jar}"
- }
-
- hdp::exec{ "hdp::lzo::package::tar install_cmd ${name}":
- command => $install_cmd
-# unless => "test -e ${jar_target_dir}/${lzo_jar}"
- }
-
- $anchor_beg = "hdp::lzo::package::tar::${name}::begin"
- $anchor_end = "hdp::lzo::package::tar::${name}::end"
- anchor{ $anchor_beg:} -> Exec["hdp::lzo::package::tar curl_cmd ${name}"] -> Exec["hdp::lzo::package::tar untar_cmd ${name}"] ->
- Exec["hdp::lzo::package::tar install_cmd ${name}"] -> anchor{ $anchor_end:}
-}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp?rev=1347371&r1=1347370&r2=1347371&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp Thu Jun 7 03:53:38 2012
@@ -257,7 +257,7 @@ class hdp::params()
} elsif ($packages == 'bigtop') {
- $package_names[hadoop] = {32 => ['hadoop','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386'], 64 => ['hadoop','hadoop-libhdfs.x86_64','hadoop-native.x86_64','hadoop-pipes.x86_64','hadoop-sbin.x86_64']}
+ $package_names[hadoop] = {32 => ['hadoop','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386','hadoop-lzo'], 64 => ['hadoop','hadoop-libhdfs.x86_64','hadoop-native.x86_64','hadoop-pipes.x86_64','hadoop-sbin.x86_64','hadoop-lzo']}
#$package_names[hadoop] = {32 => ['hadoop.i386','hadoop-native.i386'], 64 => ['hadoop.x86_64','hadoop-native.x86_64']}
$mapred_smoke_test_script = "/usr/lib/hadoop/sbin/hadoop-validate-setup.sh"