Author: rvs
Date: Tue Mar 20 18:08:25 2012
New Revision: 1303063
URL: http://svn.apache.org/viewvc?rev=1303063&view=rev
Log:
BIGTOP-449. hadoop package cleanup for hadoop-0.23
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-hdfs
- copied, changed from r1303059,
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
Removed:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1303063&r1=1303062&r2=1303063&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
Tue Mar 20 18:08:25 2012
@@ -43,12 +43,6 @@ class hadoop {
require => [Package["hadoop"]],
}
- file {
- "/etc/default/hadoop":
- content => template('hadoop/hadoop'),
- require => [Package["hadoop"]],
- }
-
package { "hadoop":
ensure => latest,
require => Package["jdk"],
@@ -84,7 +78,6 @@ class hadoop {
require => [Package["jdk"], Package["hadoop"]],
}
-
file {
"/etc/hadoop/conf/core-site.xml":
content => template('hadoop/core-site.xml'),
@@ -130,11 +123,10 @@ class hadoop {
require => Package["jdk"],
}
- if ($hadoop_security_authentication == "kerberos") {
- #FIXME: package { "hadoop-sbin":
- # ensure => latest,
- # require => [Package["hadoop"]],
- #}
+ file {
+ "/etc/default/hadoop-hdfs-datanode":
+ content => template('hadoop/hadoop-hdfs'),
+ require => [Package["hadoop-hdfs-datanode"]],
}
service { "hadoop-hdfs-datanode":
@@ -250,6 +242,12 @@ class hadoop {
creates => "${namenode_data_dirs[0]}/current/VERSION",
require => [ Package["hadoop-hdfs-namenode"], File[$dirs] ],
}
+
+ file {
+ "/etc/default/hadoop-hdfs-namenode":
+ content => template('hadoop/hadoop-hdfs'),
+ require => [Package["hadoop-hdfs-namenode"]],
+ }
file { $dirs:
ensure => directory,
@@ -272,6 +270,12 @@ class hadoop {
require => Package["jdk"],
}
+ file {
+ "/etc/default/hadoop-hdfs-secondarynamenode":
+ content => template('hadoop/hadoop-hdfs'),
+ require => [Package["hadoop-hdfs-secondarynamenode"]],
+ }
+
service { "hadoop-hdfs-secondarynamenode":
ensure => running,
hasstatus => true,
Copied:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-hdfs
(from r1303059,
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-hdfs?p2=incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-hdfs&p1=incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop&r1=1303059&r2=1303063&rev=1303063&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-hdfs
Tue Mar 20 18:08:25 2012
@@ -12,23 +12,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-export HADOOP_HOME_WARN_SUPPRESS=true
-export HADOOP_PREFIX=/usr/lib/hadoop
-export HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec
+export HADOOP_PID_DIR=/var/run/hadoop-hdfs
+export HADOOP_LOG_DIR=/var/log/hadoop-hdfs
export HADOOP_NAMENODE_USER=hdfs
export HADOOP_SECONDARYNAMENODE_USER=hdfs
export HADOOP_DATANODE_USER=hdfs
-export HADOOP_JOBTRACKER_USER=mapred
-export HADOOP_TASKTRACKER_USER=mapred
export HADOOP_IDENT_STRING=hdfs
-export HADOOP_PID_DIR=/var/run/hadoop
-export HADOOP_LOG_DIR=/var/log/hadoop
-export HADOOP_CONF_DIR=/etc/hadoop/conf
-export
HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HADOOP_PREFIX}/*:${HADOOP_PREFIX}/lib/*"
-
-# Pointless definitions making yarn happy
-export HADOOP_COMMON_HOME=${HADOOP_PREFIX}
-export HADOOP_HDFS_HOME=${HADOOP_PREFIX}
<% if hadoop_security_authentication == "kerberos" %>
export HADOOP_SECURE_DN_USER=hdfs
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml?rev=1303063&r1=1303062&r2=1303063&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
Tue Mar 20 18:08:25 2012
@@ -108,12 +108,24 @@
<property>
<description>Where to store container logs.</description>
<name>yarn.nodemanager.log-dirs</name>
- <value>/var/log/yarn</value>
+ <value>/var/log/hadoop-yarn/containers</value>
</property>
<property>
<description>Where to aggregate logs to.</description>
<name>yarn.nodemanager.remote-app-log-dir</name>
- <value>/var/log/yarn</value>
+ <value>/var/log/hadoop-yarn/apps</value>
+ </property>
+
+ <property>
+ <description>Classpath for typical applications.</description>
+ <name>yarn.application.classpath</name>
+ <value>
+ $HADOOP_CONF_DIR,
+ $HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*,
+ $HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*,
+ $HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*,
+ $YARN_HOME/*,$YARN_HOME/lib/*
+ </value>
</property>
</configuration>
