Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B56EB7B0F for ; Thu, 27 Oct 2011 00:40:58 +0000 (UTC) Received: (qmail 99631 invoked by uid 500); 27 Oct 2011 00:40:58 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 99597 invoked by uid 500); 27 Oct 2011 00:40:58 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 99590 invoked by uid 99); 27 Oct 2011 00:40:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2011 00:40:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2011 00:40:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4CC6823889E3; Thu, 27 Oct 2011 00:40:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1189559 - in /incubator/bigtop/trunk: bigtop-deploy/puppet/modules/hadoop/templates/hadoop bigtop-packages/src/common/hadoop/hadoop.default Date: Thu, 27 Oct 2011 00:40:35 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111027004035.4CC6823889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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