You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2011/01/03 20:34:54 UTC
svn commit: r1054718 - in /incubator/whirr/trunk: CHANGES.txt
scripts/apache/hadoop/post-configure scripts/apache/hbase/post-configure
Author: tomwhite
Date: Mon Jan 3 19:34:54 2011
New Revision: 1054718
URL: http://svn.apache.org/viewvc?rev=1054718&view=rev
Log:
WHIRR-179. [Hadoop] Guard /tmp mkdir call against existing directory. Contributed by Lars George.
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/scripts/apache/hadoop/post-configure
incubator/whirr/trunk/scripts/apache/hbase/post-configure
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1054718&r1=1054717&r2=1054718&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Jan 3 19:34:54 2011
@@ -78,6 +78,9 @@ Trunk (unreleased changes)
WHIRR-180. ListClusterCommand.run throws a NullPointerException for
unrecognized service names. (Andrei Savu via tomwhite)
+ WHIRR-179. [Hadoop] Guard $MOUNT/tmp mkdir call against existing directory.
+ (Lars George via tomwhite)
+
Release 0.2.0 - 2010-11-04
NEW FEATURES
Modified: incubator/whirr/trunk/scripts/apache/hadoop/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hadoop/post-configure?rev=1054718&r1=1054717&r2=1054718&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hadoop/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/hadoop/post-configure Mon Jan 3 19:34:54 2011
@@ -107,13 +107,13 @@ function configure_hadoop() {
MAX_REDUCE_TASKS=1
CHILD_OPTS=-Xmx550m
CHILD_ULIMIT=1126400
- TMP_DIR=$MOUNT/tmp/hadoop-\${user.name}
mkdir -p $MOUNT/hadoop
chown hadoop:hadoop $MOUNT/hadoop
- mkdir $MOUNT/tmp
- chmod a+rwxt $MOUNT/tmp
-
+ if [ ! -e $MOUNT/tmp ]; then
+ mkdir $MOUNT/tmp
+ chmod a+rwxt $MOUNT/tmp
+ fi
mkdir /etc/hadoop
ln -s $HADOOP_CONF_DIR /etc/hadoop/conf
Modified: incubator/whirr/trunk/scripts/apache/hbase/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hbase/post-configure?rev=1054718&r1=1054717&r2=1054718&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hbase/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/hbase/post-configure Mon Jan 3 19:34:54 2011
@@ -78,11 +78,13 @@ function configure_hbase() {
MOUNT=/data
;;
esac
+
mkdir -p $MOUNT/hbase
chown hadoop:hadoop $MOUNT/hbase
- mkdir $MOUNT/tmp
- chmod a+rwxt $MOUNT/tmp
-
+ if [ ! -e $MOUNT/tmp ]; then
+ mkdir $MOUNT/tmp
+ chmod a+rwxt $MOUNT/tmp
+ fi
mkdir /etc/hbase
ln -s $HBASE_CONF_DIR /etc/hbase/conf