Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11966. Variable cygwin is undefined in hadoop-config.sh when executed through hadoop-daemon.sh. Contributed by Chris Nauroth.

This commit is contained in:
cnauroth 2015-05-13 12:25:49 -07:00
parent 2e9392c157
commit ddc4afeff2
6 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -244,6 +244,9 @@ Release 2.7.1 - UNRELEASED
HADOOP-11663. Remove description about Java 6 from docs.
(Masatake Iwasaki via aajisaka)
HADOOP-11966. Variable cygwin is undefined in hadoop-config.sh when executed
through hadoop-daemon.sh. (cnauroth)
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES

5
hadoop-common-project/hadoop-common/src/main/bin/hadoop
View File

@ -23,11 +23,6 @@ bin=`cd "$bin"; pwd`
DEFAULT_LIBEXEC_DIR="$bin"/../libexec
cygwin=false
case "$(uname)" in
CYGWIN*) cygwin=true;;
esac
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/hadoop-config.sh

5
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
View File

@ -145,6 +145,11 @@ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
. "${HADOOP_CONF_DIR}/hadoop-env.sh"
fi
cygwin=false
case "$(uname)" in
CYGWIN*) cygwin=true;;
esac
# check if net.ipv6.bindv6only is set to 1
bindv6only=$(/sbin/sysctl -n net.ipv6.bindv6only 2> /dev/null)
if [ -n "$bindv6only" ] && [ "$bindv6only" -eq "1" ] && [ "$HADOOP_ALLOW_IPV6" != "yes" ]

5
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
View File

@ -31,11 +31,6 @@ bin=`cd "$bin" > /dev/null; pwd`
DEFAULT_LIBEXEC_DIR="$bin"/../libexec
cygwin=false
case "$(uname)" in
CYGWIN*) cygwin=true;;
esac
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/hdfs-config.sh

5
hadoop-mapreduce-project/bin/mapred
View File

@ -21,11 +21,6 @@ bin=`cd "$bin"; pwd`
DEFAULT_LIBEXEC_DIR="$bin"/../libexec
cygwin=false
case "$(uname)" in
CYGWIN*) cygwin=true;;
esac
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
if [ -e ${HADOOP_LIBEXEC_DIR}/mapred-config.sh ]; then
. ${HADOOP_LIBEXEC_DIR}/mapred-config.sh

5
hadoop-yarn-project/hadoop-yarn/bin/yarn
View File

@ -56,11 +56,6 @@ bin=`cd "$bin"; pwd`
DEFAULT_LIBEXEC_DIR="$bin"/../libexec
cygwin=false
case "$(uname)" in
CYGWIN*) cygwin=true;;
esac
HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
. $HADOOP_LIBEXEC_DIR/yarn-config.sh