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

HADOOP-11284. Fix variable name mismatches in hadoop-functions.sh (Masatake Iwasaki via aw)

This commit is contained in:
Allen Wittenauer 2014-11-12 15:58:51 -08:00
parent 306f0c9cea
commit d7150a1bc2
2 changed files with 10 additions and 7 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

@ -340,6 +340,9 @@ Trunk (Unreleased)
HADOOP-11248. Add hadoop configuration to disable Azure Filesystem metrics HADOOP-11248. Add hadoop configuration to disable Azure Filesystem metrics
collection. (Shanyu Zhao via cnauroth) collection. (Shanyu Zhao via cnauroth)
HADOOP-11284. Fix variable name mismatches in hadoop-functions.sh (Masatake
Iwasaki via aw)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd) HADOOP-7761. Improve the performance of raw comparisons. (todd)

14
hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
View File

@ -837,13 +837,13 @@ function hadoop_start_daemon_wrapper
# shellcheck disable=SC2086 # shellcheck disable=SC2086
renice "${HADOOP_NICENESS}" $! >/dev/null 2>&1 renice "${HADOOP_NICENESS}" $! >/dev/null 2>&1
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
hadoop_error "ERROR: Cannot set priority of ${daemoname} process $!" hadoop_error "ERROR: Cannot set priority of ${daemonname} process $!"
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
disown %+ >/dev/null 2>&1 disown %+ >/dev/null 2>&1
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
hadoop_error "ERROR: Cannot disconnect ${daemoname} process $!" hadoop_error "ERROR: Cannot disconnect ${daemonname} process $!"
fi fi
sleep 1 sleep 1
@ -898,7 +898,7 @@ function hadoop_start_secure_daemon
#shellcheck disable=SC2086 #shellcheck disable=SC2086
echo $$ > "${privpidfile}" 2>/dev/null echo $$ > "${privpidfile}" 2>/dev/null
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
hadoop_error "ERROR: Cannot write ${daemoname} pid ${privpidfile}." hadoop_error "ERROR: Cannot write ${daemonname} pid ${privpidfile}."
fi fi
exec "${jsvc}" \ exec "${jsvc}" \
@ -954,7 +954,7 @@ function hadoop_start_secure_daemon_wrapper
# so let's wait for the fork to finish # so let's wait for the fork to finish
# before overriding with the daemonized pid # before overriding with the daemonized pid
(( counter=0 )) (( counter=0 ))
while [[ ! -f ${pidfile} && ${counter} -le 5 ]]; do while [[ ! -f ${daemonpidfile} && ${counter} -le 5 ]]; do
sleep 1 sleep 1
(( counter++ )) (( counter++ ))
done done
@ -963,7 +963,7 @@ function hadoop_start_secure_daemon_wrapper
#shellcheck disable=SC2086 #shellcheck disable=SC2086
echo $! > "${jsvcpidfile}" 2>/dev/null echo $! > "${jsvcpidfile}" 2>/dev/null
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
hadoop_error "ERROR: Cannot write ${daemonname} pid ${pidfile}." hadoop_error "ERROR: Cannot write ${daemonname} pid ${daemonpidfile}."
fi fi
sleep 1 sleep 1
@ -1037,8 +1037,8 @@ function hadoop_daemon_handler
local daemonmode=$1 local daemonmode=$1
local daemonname=$2 local daemonname=$2
local class=$3 local class=$3
local pidfile=$4 local daemon_pidfile=$4
local outfile=$5 local daemon_outfile=$5
shift 5 shift 5
case ${daemonmode} in case ${daemonmode} in