Author: abayer
Date: Thu Aug 23 23:24:48 2012
New Revision: 1376773
URL: http://svn.apache.org/viewvc?rev=1376773&view=rev
Log:
WHIRR-641. Race condition between collocated namenode and jobtracker start/init
services. Contributed by Graham Gear.
Modified:
whirr/branches/branch-0.8/CHANGES.txt
whirr/branches/branch-0.8/services/cdh/src/main/resources/functions/configure_cdh_hadoop.sh
whirr/branches/branch-0.8/services/hadoop/src/main/resources/functions/configure_hadoop.sh
Modified: whirr/branches/branch-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/branches/branch-0.8/CHANGES.txt?rev=1376773&r1=1376772&r2=1376773&view=diff
==============================================================================
--- whirr/branches/branch-0.8/CHANGES.txt (original)
+++ whirr/branches/branch-0.8/CHANGES.txt Thu Aug 23 23:24:48 2012
@@ -11,6 +11,9 @@ Release 0.8.1 (unreleased changes)
WHIRR-641. Improved parsing of config ->
TemplateBuilderSpec. (Adrian Cole via abayer)
+ WHIRR-645. Race condition between collocated namenode and
+ jobtracker services. (Graham Gear via abayer)
+
Release 0.8.0 - 2012-08-17
NEW FEATURES
Modified:
whirr/branches/branch-0.8/services/cdh/src/main/resources/functions/configure_cdh_hadoop.sh
URL:
http://svn.apache.org/viewvc/whirr/branches/branch-0.8/services/cdh/src/main/resources/functions/configure_cdh_hadoop.sh?rev=1376773&r1=1376772&r2=1376773&view=diff
==============================================================================
---
whirr/branches/branch-0.8/services/cdh/src/main/resources/functions/configure_cdh_hadoop.sh
(original)
+++
whirr/branches/branch-0.8/services/cdh/src/main/resources/functions/configure_cdh_hadoop.sh
Thu Aug 23 23:24:48 2012
@@ -68,11 +68,12 @@ function configure_cdh_hadoop() {
chgrp -R hadoop $HADOOP_LOG_DIR
chmod -R g+w $HADOOP_LOG_DIR
+ if [ $(echo "$ROLES" | grep "hadoop-namenode" | wc -l) -gt 0 ]; then
+ start_namenode
+ fi
+
for role in $(echo "$ROLES" | tr "," "\n"); do
case $role in
- hadoop-namenode)
- start_namenode
- ;;
hadoop-secondarynamenode)
start_hadoop_daemon $HDFS_PACKAGE_PREFIX-secondarynamenode
;;
Modified:
whirr/branches/branch-0.8/services/hadoop/src/main/resources/functions/configure_hadoop.sh
URL:
http://svn.apache.org/viewvc/whirr/branches/branch-0.8/services/hadoop/src/main/resources/functions/configure_hadoop.sh?rev=1376773&r1=1376772&r2=1376773&view=diff
==============================================================================
---
whirr/branches/branch-0.8/services/hadoop/src/main/resources/functions/configure_hadoop.sh
(original)
+++
whirr/branches/branch-0.8/services/hadoop/src/main/resources/functions/configure_hadoop.sh
Thu Aug 23 23:24:48 2012
@@ -55,12 +55,13 @@ function configure_hadoop() {
mkdir -p $(dirname $HADOOP_LOG_DIR)
ln -s /data/hadoop/logs $HADOOP_LOG_DIR
chown -R hadoop:hadoop $HADOOP_LOG_DIR
-
+
+ if [ $(echo "$ROLES" | grep "hadoop-namenode" | wc -l) -gt 0 ]; then
+ start_namenode
+ fi
+
for role in $(echo "$ROLES" | tr "," "\n"); do
case $role in
- hadoop-namenode)
- start_namenode
- ;;
hadoop-secondarynamenode)
start_hadoop_daemon secondarynamenode
;;
