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

HADOOP-11025. hadoop-daemons.sh should just call hdfs directly (Masatake Iwasaki via aw)

This commit is contained in:
Allen Wittenauer 2014-11-12 15:46:58 -08:00
parent 782abbb000
commit 306f0c9cea
3 changed files with 19 additions and 6 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

@ -135,6 +135,9 @@ Trunk (Unreleased)
HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9) HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9)
HADOOP-11025. hadoop-daemons.sh should just call hdfs directly (Masatake
Iwasaki via aw)
BUG FIXES BUG FIXES
HADOOP-9451. Fault single-layer config if node group topology is enabled. HADOOP-9451. Fault single-layer config if node group topology is enabled.

19
hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemons.sh
View File

@ -36,10 +36,10 @@ fi
HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}" HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
HADOOP_NEW_CONFIG=true HADOOP_NEW_CONFIG=true
if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then if [[ -f "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh" ]]; then
. "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" . "${HADOOP_LIBEXEC_DIR}/hdfs-config.sh"
else else
echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1 echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hdfs-config.sh." 2>&1
exit 1 exit 1
fi fi
@ -47,5 +47,14 @@ if [[ $# = 0 ]]; then
hadoop_exit_with_usage 1 hadoop_exit_with_usage 1
fi fi
hadoop_connect_to_hosts "${bin}/hadoop-daemon.sh" \ daemonmode=$1
--config "${HADOOP_CONF_DIR}" "$@" shift
if [[ -z "${HADOOP_HDFS_HOME}" ]]; then
hdfsscript="${HADOOP_PREFIX}/bin/hdfs"
else
hdfsscript="${HADOOP_HDFS_HOME}/bin/hdfs"
fi
hadoop_connect_to_hosts "$hdfsscript" \
--config "${HADOOP_CONF_DIR}" --daemon "${daemonmode}" "$@"

3
hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
View File

@ -175,7 +175,8 @@ esac
# This sets the hadoop.root.logger property # This sets the hadoop.root.logger property
# export HADOOP_ROOT_LOGGER=INFO,console # export HADOOP_ROOT_LOGGER=INFO,console
# Default log level for daemons spawned explicitly by hadoop-daemon.sh # Default log level for daemons spawned explicitly by
# --daemon option of hadoop, hdfs, mapred and yarn command.
# This sets the hadoop.root.logger property # This sets the hadoop.root.logger property
# export HADOOP_DAEMON_ROOT_LOGGER=INFO,RFA # export HADOOP_DAEMON_ROOT_LOGGER=INFO,RFA