Author: rvs
Date: Thu Oct 27 00:40:34 2011
New Revision: 1189559
URL: http://svn.apache.org/viewvc?rev=1189559&view=rev
Log:
BIGTOP-181. puppeted hadoop doesn't place PID files into /var/run/hadoop
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop?rev=1189559&r1=1189558&r2=1189559&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
(original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
Thu Oct 27 00:40:34 2011
@@ -1,12 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
export HADOOP_HOME_WARN_SUPPRESS=true
export HADOOP_HOME=/usr/lib/hadoop
+export HADOOP_PID_DIR=/var/run/hadoop
+export HADOOP_LOG_DIR=/var/log/hadoop
export HADOOP_NAMENODE_USER=hdfs
export HADOOP_SECONDARYNAMENODE_USER=hdfs
export HADOOP_DATANODE_USER=hdfs
<% if hadoop_security_authentication == "kerberos" %>
export HADOOP_SECURE_DN_USER=hdfs
+export HADOOP_SECURE_DN_PID_DIR=$HADOOP_PID_DIR
+export HADOOP_SECURE_DN_LOG_DIR=$HADOOP_LOG_DIR
<% end %>
export HADOOP_JOBTRACKER_USER=mapred
export HADOOP_TASKTRACKER_USER=mapred
export HADOOP_IDENT_STRING=hadoop
-export JAVA_HOME=/usr/java/latest
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default?rev=1189559&r1=1189558&r2=1189559&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default Thu
Oct 27 00:40:34 2011
@@ -21,3 +21,4 @@ export HADOOP_JOBTRACKER_USER=mapred
export HADOOP_TASKTRACKER_USER=mapred
export HADOOP_IDENT_STRING=hadoop
export HADOOP_PID_DIR=/var/run/hadoop
+export HADOOP_LOG_DIR=/var/log/hadoop
