Repository: hadoop Updated Branches: refs/heads/HADOOP-13341 5a59ce467 -> a37f887c3
HADOOP-13564. modify mapred to use hadoop_subcommand_opts Signed-off-by: Allen Wittenauer <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a37f887c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a37f887c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a37f887c Branch: refs/heads/HADOOP-13341 Commit: a37f887c30387ff5420141ad9da8308ae142f3b1 Parents: 5a59ce4 Author: Allen Wittenauer <[email protected]> Authored: Tue Aug 30 15:11:24 2016 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Tue Aug 30 15:34:52 2016 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/bin/mapred | 11 +++++++---- hadoop-mapreduce-project/bin/mapred-config.sh | 10 ++++++---- hadoop-mapreduce-project/conf/mapred-env.sh | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a37f887c/hadoop-mapreduce-project/bin/mapred ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred index c566d5a..fe7c56a 100755 --- a/hadoop-mapreduce-project/bin/mapred +++ b/hadoop-mapreduce-project/bin/mapred @@ -69,8 +69,6 @@ function mapredcmd_case historyserver) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" HADOOP_CLASSNAME=org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer - hadoop_debug "Appending HADOOP_JOB_HISTORYSERVER_OPTS onto HADOOP_OPTS" - HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_JOB_HISTORYSERVER_OPTS}" if [ -n "${HADOOP_JOB_HISTORYSERVER_HEAPSIZE}" ]; then # shellcheck disable=SC2034 HADOOP_HEAPSIZE_MAX="${HADOOP_JOB_HISTORYSERVER_HEAPSIZE}" @@ -144,13 +142,18 @@ fi hadoop_add_client_opts -if [[ ${HADOOP_SLAVE_MODE} = true ]]; then - hadoop_common_slave_mode_execute "${HADOOP_MAPRED_HOME}/bin/mapred" "${HADOOP_USER_PARAMS[@]}" +if [[ ${HADOOP_WORKER_MODE} = true ]]; then + hadoop_common_worker_mode_execute "${HADOOP_MAPRED_HOME}/bin/mapred" "${HADOOP_USER_PARAMS[@]}" exit $? fi +hadoop_subcommand_opts "${HADOOP_SHELL_EXECNAME}" "${HADOOP_SUBCMD}" + if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}" + + hadoop_subcommand_secure_opts "${HADOOP_SHELL_EXECNAME}" "${HADOOP_SUBCMD}" + hadoop_verify_secure_prereq hadoop_setup_secure_service priv_outfile="${HADOOP_LOG_DIR}/privileged-${HADOOP_IDENT_STRING}-${HADOOP_SUBCMD}-${HOSTNAME}.out" http://git-wip-us.apache.org/repos/asf/hadoop/blob/a37f887c/hadoop-mapreduce-project/bin/mapred-config.sh ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/bin/mapred-config.sh b/hadoop-mapreduce-project/bin/mapred-config.sh old mode 100644 new mode 100755 index a989792..68d3463d --- a/hadoop-mapreduce-project/bin/mapred-config.sh +++ b/hadoop-mapreduce-project/bin/mapred-config.sh @@ -26,7 +26,7 @@ function hadoop_subproject_init export HADOOP_MAPRED_ENV_PROCESSED=true fi fi - + # at some point in time, someone thought it would be a good idea to # create separate vars for every subproject. *sigh* # let's perform some overrides and setup some defaults for bw compat @@ -38,15 +38,17 @@ function hadoop_subproject_init hadoop_deprecate_envvar HADOOP_MAPRED_LOG_DIR HADOOP_LOG_DIR hadoop_deprecate_envvar HADOOP_MAPRED_LOGFILE HADOOP_LOGFILE - + hadoop_deprecate_envvar HADOOP_MAPRED_NICENESS HADOOP_NICENESS - + hadoop_deprecate_envvar HADOOP_MAPRED_STOP_TIMEOUT HADOOP_STOP_TIMEOUT - + hadoop_deprecate_envvar HADOOP_MAPRED_PID_DIR HADOOP_PID_DIR hadoop_deprecate_envvar HADOOP_MAPRED_ROOT_LOGGER HADOOP_ROOT_LOGGER + hadoop_deprecate_envvar HADOOP_JOB_HISTORY_OPTS MAPRED_HISTORYSERVER_OPTS + HADOOP_MAPRED_HOME="${HADOOP_MAPRED_HOME:-$HADOOP_HOME}" hadoop_deprecate_envvar HADOOP_MAPRED_IDENT_STRING HADOOP_IDENT_STRING http://git-wip-us.apache.org/repos/asf/hadoop/blob/a37f887c/hadoop-mapreduce-project/conf/mapred-env.sh ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/conf/mapred-env.sh b/hadoop-mapreduce-project/conf/mapred-env.sh index bbe4a49..53bc296 100644 --- a/hadoop-mapreduce-project/conf/mapred-env.sh +++ b/hadoop-mapreduce-project/conf/mapred-env.sh @@ -31,14 +31,14 @@ # Specify the max heapsize for the JobHistoryServer. If no units are # given, it will be assumed to be in MB. # This value will be overridden by an Xmx setting specified in HADOOP_OPTS, -# and/or HADOOP_JOB_HISTORYSERVER_OPTS. +# and/or MAPRED_HISTORYSERVER_OPTS. # Default is the same as HADOOP_HEAPSIZE_MAX. #export HADOOP_JOB_HISTORYSERVER_HEAPSIZE= # Specify the JVM options to be used when starting the HistoryServer. # These options will be appended to the options specified as HADOOP_OPTS # and therefore may override any similar flags set in HADOOP_OPTS -#export HADOOP_JOB_HISTORYSERVER_OPTS= +#export MAPRED_HISTORYSERVER_OPTS= # Specify the log4j settings for the JobHistoryServer # Java property: hadoop.root.logger --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
