incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject svn commit: r1360443 - in /incubator/ambari/trunk: ./ hmc/puppet/modules/hdp-hadoop/manifests/ hmc/puppet/modules/hdp-hcat/manifests/ hmc/puppet/modules/hdp-pig/manifests/ hmc/puppet/modules/hdp-sqoop/manifests/ hmc/puppet/modules/hdp-templeton/manifes...
Date Wed, 11 Jul 2012 22:17:37 GMT
Author: hitesh
Date: Wed Jul 11 22:17:37 2012
New Revision: 1360443

URL: http://svn.apache.org/viewvc?rev=1360443&view=rev
Log:
AMBARI-624. Make hadoop-client/templeton/pig/sqoop also use 64-bit only packages (Contributed
by hitesh)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/client.pp
    incubator/ambari/trunk/hmc/puppet/modules/hdp-hcat/manifests/init.pp
    incubator/ambari/trunk/hmc/puppet/modules/hdp-pig/manifests/init.pp
    incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/init.pp
    incubator/ambari/trunk/hmc/puppet/modules/hdp-templeton/manifests/init.pp
    incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Jul 11 22:17:37 2012
@@ -50,6 +50,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    AMBARI-624. Make hadoop-client/templeton/pig/sqoop also use 64-bit only packages
+    (hitesh)
+
     AMBARI-625. Fix undefined variable warning in puppet php layer (hitesh)
 
     AMBARI-614. The database set up script has a duplicate definition of

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/client.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/client.pp?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/client.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-hadoop/manifests/client.pp Wed Jul 11 22:17:37
2012
@@ -25,8 +25,14 @@ class hdp-hadoop::client(
   $hdp::params::service_exists['hdp-hadoop::client'] = true
 
   Hdp-hadoop::Common<||>{service_states +> $service_state}
-  Hdp-hadoop::Package<||>{include_32_bit => true}
-  Hdp-hadoop::Configfile<||>{sizes +> 32}
+
+  if ($hdp::params::use_32_bits_on_slaves == true) {
+    Hdp-hadoop::Package<||>{include_32_bit => true}
+    Hdp-hadoop::Configfile<||>{sizes +> 32}
+  } else {
+    Hdp-hadoop::Package<||>{include_64_bit => true}
+    Hdp-hadoop::Configfile<||>{sizes +> 64}
+  }
 
   if ($service_state == 'no_op') {
   } elsif ($service_state in ['installed_and_configured','uninstalled']) {

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-hcat/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-hcat/manifests/init.pp?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-hcat/manifests/init.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-hcat/manifests/init.pp Wed Jul 11 22:17:37
2012
@@ -23,12 +23,18 @@ class hdp-hcat(
 ) inherits hdp-hcat::params
 {
   $hcat_config_dir = $hdp-hcat::params::hcat_conf_dir
-   
+
+  if ($hdp::params::use_32_bits_on_slaves == false) {
+    $size = 64
+  } else {
+    $size = 32
+  }
+
   if ($service_state == 'no_op') {
   } elsif ($service_state == 'uninstalled') {
     hdp::package { 'hcat' :
       ensure => 'uninstalled', 
-      size   => 32
+      size   => $size
     }
 
     hdp::directory { $hcat_config_dir:
@@ -40,7 +46,7 @@ class hdp-hcat(
 
   } elsif ($service_state == 'installed_and_configured') {
     hdp::package { 'hcat' : 
-      size => 32
+      size => $size
     }
 
     hdp::directory { $hcat_config_dir:

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-pig/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-pig/manifests/init.pp?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-pig/manifests/init.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-pig/manifests/init.pp Wed Jul 11 22:17:37
2012
@@ -24,11 +24,17 @@ class hdp-pig(
 {  
   $pig_config_dir = $hdp-pig::params::pig_conf_dir
  
+  if ($hdp::params::use_32_bits_on_slaves == false) {
+    $size = 64
+  } else {
+    $size = 32
+  }
+
   if ($service_state == 'no_op') {
   } elsif ($service_state == 'uninstalled') {
     hdp::package { 'pig' :
       ensure => 'uninstalled',
-      size   => 32
+      size   => $size
     }
     hdp::directory_recursive_create { $pig_config_dir:
       service_state => $service_state,
@@ -38,7 +44,7 @@ class hdp-pig(
 
   } elsif ($service_state == 'installed_and_configured') {
     hdp::package { 'pig' : 
-      size => 32
+      size => $size
     }
 
     hdp::directory { $pig_config_dir:

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/init.pp?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/init.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/init.pp Wed Jul 11 22:17:37
2012
@@ -21,17 +21,23 @@
 class hdp-sqoop(
   $service_state = $hdp::params::cluster_client_state
 ) inherits hdp-sqoop::params
-{ 
+{
+  if ($hdp::params::use_32_bits_on_slaves == false) {
+    $size = 64
+  } else {
+    $size = 32
+  }
+
   if ($service_state == 'no_op') {
   } elsif ($service_state == 'uninstalled') {
     hdp::package { 'sqoop' :
       ensure => 'uninstalled',
-      size   => 32
+      size   => $size
     }
   } elsif ($service_state == 'installed_and_configured') {
 
     hdp::package { 'sqoop' :
-      size => 32
+      size => $size
     }
     class { 'hdp-sqoop::mysql-connector': }
     if ($package_type == 'hdp') {

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-templeton/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-templeton/manifests/init.pp?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-templeton/manifests/init.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-templeton/manifests/init.pp Wed Jul 11 22:17:37
2012
@@ -25,12 +25,18 @@ class hdp-templeton(
 {
   include hdp-templeton::params 
  
+  if ($hdp::params::use_32_bits_on_slaves == false) {
+    $size = 64
+  } else {
+    $size = 32
+  }
+
   $templeton_user = $hdp-templeton::params::templeton_user
   $templeton_config_dir = $hdp-templeton::params::conf_dir
 
   if ($service_state == 'uninstalled') {
       hdp::package { 'templeton' :
-      size => 32,
+      size => $size,
       ensure => 'uninstalled'
     }
       hdp::directory { $templeton_config_dir:
@@ -42,7 +48,7 @@ class hdp-templeton(
 
   } else {
     hdp::package { 'templeton' :
-    size => 32
+      size => $size
     }
     class { hdp-templeton::download-hive-tar: }
     class { hdp-templeton::download-pig-tar: }

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp?rev=1360443&r1=1360442&r2=1360443&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp Wed Jul 11 22:17:37
2012
@@ -238,7 +238,8 @@ class hdp::params()
     #   32 => 'sqoop-1.4.1-1.noarch'
     #},
     templeton => {
-       32 => 'templeton'
+       32 => 'templeton',
+       64 => 'templeton'
     },
     oozie-client => {
       64 => 'oozie-client.noarch'
@@ -261,20 +262,20 @@ class hdp::params()
     },
     mysql => {
       32 =>  ['mysql','mysql-server']
-  },
+    },
     mysql-connector => {
       64 =>  ['mysql-connector-java']
-  },
+    },
     extjs => {
       64 =>  ['extjs-2.2-1']
-  },
-     templeton-tar-hive => { 
+    },
+    templeton-tar-hive => {
       64 => ['templeton-tar-hive-0.0.1-1']
-  },
-     templeton-tar-pig => {
-       64 => ['templeton-tar-pig-0.0.1-1']
+    },
+    templeton-tar-pig => {
+      64 => ['templeton-tar-pig-0.0.1-1']
+    }
   }
-}
   $packages = 'bigtop' 
   if ($packages == 'hdp') {
     $package_names[hadoop] = { 32 => ['hadoop.i386'], 64 => ['hadoop.x86_64']}
@@ -304,7 +305,7 @@ class hdp::params()
 
   } elsif ($packages == 'bigtop') {  
 
-    $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','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386','hadoop-lzo'],
64 => ['hadoop','hadoop-libhdfs','hadoop-native','hadoop-pipes','hadoop-sbin','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"
@@ -322,9 +323,9 @@ class hdp::params()
     $use_32_bits_on_slaves = false
     $package_names[zookeeper] = {64 => ['zookeeper']}
     $package_names[hbase] = {64 => ['hbase']}
-    $package_names[sqoop] = {32 => ['sqoop']}
-    $package_names[pig] = {32 => ['pig.noarch']}
-    $package_names[hcat] = {32 => ['hcatalog']}
+    $package_names[sqoop] = {32 => ['sqoop'], 64 => ['sqoop']}
+    $package_names[pig] = {32 => ['pig.noarch'], 64 => ['pig.noarch']}
+    $package_names[hcat] = {32 => ['hcatalog'], 64 => ['hcatalog']}
     $package_names[hive] = {64 => ['hive']}
     $zk_bin = '/usr/lib/zookeeper/bin'
     $zk_smoke_test_script = "/usr/lib/zookeeper/bin/zkCli.sh"



Mime
View raw message