Skip to content

Commit

Permalink
avoid 'No HADOOP_CONF_DIR set' warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ekoontz committed Apr 14, 2012
1 parent 0bf29fe commit 3ce4266
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions bin/giraph
Expand Up @@ -109,6 +109,10 @@ if [ "$HADOOP_HOME" = "" ] ; then
exit 1
fi

#avoid 'HADOOP_HOME is deprecated' warnings from Hadoop (1.0 and above).
HADOOP_CONF_DIR=$HADOOP_HOME/conf
HADOOP_TMP=$HADOOP_HOME
unset HADOOP_HOME

if [ "$HADOOP_CONF_DIR" = "" ] ; then
HADOOP_CONF_DIR=$HADOOP_HOME/conf
Expand All @@ -120,8 +124,4 @@ fi
# Giraph's jars to add to distributed cache via -libjar, which are csv rather than :sv
GIRAPH_JARS=`echo ${JAR}:${CLASSPATH}|sed s/:/,/g`
export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$CLASSPATH
#avoid 'HADOOP_HOME is deprecated' warnings from Hadoop (1.0 and above).
HADOOP_CONF_DIR=$HADOOP_HOME/conf
HADOOP_TMP=$HADOOP_HOME
unset HADOOP_HOME
HADOOP_CONF_DIR=$HADOOP_CONF_DIR exec "$HADOOP_TMP/bin/hadoop" --config $HADOOP_CONF_DIR jar $JAR $CLASS $HADOOP_PROPERTIES -libjars $GIRAPH_JARS "$@"

0 comments on commit 3ce4266

Please sign in to comment.