HADOOP-11630 Allow HDFS to bind to ipv6 conditionally Signed-off-by: Elliott Clark <elli...@fb.com>
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e6347c99 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e6347c99 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e6347c99 Branch: refs/heads/HADOOP-11890 Commit: e6347c99cae353a6197766c2ff45782f28429c6f Parents: eb6379c Author: Elliott Clark <elli...@fb.com> Authored: Tue Feb 24 13:08:28 2015 -0800 Committer: Elliott Clark <ecl...@apache.org> Committed: Fri Oct 23 11:52:43 2015 -0700 ---------------------------------------------------------------------- .../hadoop-common/src/main/bin/hadoop-functions.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6347c99/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh index dcf1de8..d5e60c1 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -269,7 +269,11 @@ function hadoop_bootstrap export HADOOP_OS_TYPE=${HADOOP_OS_TYPE:-$(uname -s)} # defaults - export HADOOP_OPTS=${HADOOP_OPTS:-"-Djava.net.preferIPv4Stack=true"} + if [[ "${HADOOP_ALLOW_IPV6}" -ne "yes" ]]; then + export HADOOP_OPTS=${HADOOP_OPTS:-"-Djava.net.preferIPv4Stack=true"} + else + export HADOOP_OPTS=${HADOOP_OPTS:-""} + fi hadoop_debug "Initial HADOOP_OPTS=${HADOOP_OPTS}" }
