HADOOP-7984. Add hadoop --loglevel option to change log level. Contributed by Aikira AJISAKA.
This commit is contained in:
parent
e073b61dc4
commit
0abb973f09
@ -357,6 +357,9 @@ Release 2.7.0 - UNRELEASED
|
||||
|
||||
HADOOP-10987. Provide an iterator-based listing API for FileSystem (kihwal)
|
||||
|
||||
HADOOP-7984. Add hadoop --loglevel option to change log level.
|
||||
(Akira AJISAKA via cnauroth)
|
||||
|
||||
IMPROVEMENTS
|
||||
|
||||
HADOOP-11156. DelegateToFileSystem should implement
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
function hadoop_usage()
|
||||
{
|
||||
echo "Usage: hadoop [--config confdir] COMMAND"
|
||||
echo "Usage: hadoop [--config confdir] [--loglevel loglevel] COMMAND"
|
||||
echo " where COMMAND is one of:"
|
||||
echo " archive -archiveName NAME -p <parent path> <src>* <dest>"
|
||||
echo " create a Hadoop archive"
|
||||
|
@ -88,6 +88,16 @@ if "%1" == "--hosts" (
|
||||
shift
|
||||
)
|
||||
|
||||
@rem
|
||||
@rem Set log level. Default to INFO.
|
||||
@rem
|
||||
|
||||
if "%1" == "--loglevel" (
|
||||
set HADOOP_LOGLEVEL=%2
|
||||
shift
|
||||
shift
|
||||
)
|
||||
|
||||
if exist %HADOOP_CONF_DIR%\hadoop-env.cmd (
|
||||
call %HADOOP_CONF_DIR%\hadoop-env.cmd
|
||||
)
|
||||
@ -157,8 +167,12 @@ if not defined HADOOP_LOGFILE (
|
||||
set HADOOP_LOGFILE=hadoop.log
|
||||
)
|
||||
|
||||
if not defined HADOOP_LOGLEVEL (
|
||||
set HADOOP_LOGLEVEL=INFO
|
||||
)
|
||||
|
||||
if not defined HADOOP_ROOT_LOGGER (
|
||||
set HADOOP_ROOT_LOGGER=INFO,console
|
||||
set HADOOP_ROOT_LOGGER=%HADOOP_LOGLEVEL%,console
|
||||
)
|
||||
|
||||
@rem
|
||||
|
@ -148,6 +148,12 @@ while [[ -z "${_hadoop_common_done}" ]]; do
|
||||
hadoop_populate_slaves_file "$1"
|
||||
shift
|
||||
;;
|
||||
--loglevel)
|
||||
shift
|
||||
# shellcheck disable=SC2034
|
||||
HADOOP_LOGLEVEL="$1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
_hadoop_common_done=true
|
||||
;;
|
||||
|
@ -155,11 +155,12 @@ function hadoop_basic_init
|
||||
HADOOP_IDENT_STRING=${HADOP_IDENT_STRING:-$USER}
|
||||
HADOOP_LOG_DIR=${HADOOP_LOG_DIR:-"${HADOOP_PREFIX}/logs"}
|
||||
HADOOP_LOGFILE=${HADOOP_LOGFILE:-hadoop.log}
|
||||
HADOOP_LOGLEVEL=${HADOOP_LOGLEVEL:-INFO}
|
||||
HADOOP_NICENESS=${HADOOP_NICENESS:-0}
|
||||
HADOOP_STOP_TIMEOUT=${HADOOP_STOP_TIMEOUT:-5}
|
||||
HADOOP_PID_DIR=${HADOOP_PID_DIR:-/tmp}
|
||||
HADOOP_ROOT_LOGGER=${HADOOP_ROOT_LOGGER:-INFO,console}
|
||||
HADOOP_DAEMON_ROOT_LOGGER=${HADOOP_DAEMON_ROOT_LOGGER:-INFO,RFA}
|
||||
HADOOP_ROOT_LOGGER=${HADOOP_ROOT_LOGGER:-${HADOOP_LOGLEVEL},console}
|
||||
HADOOP_DAEMON_ROOT_LOGGER=${HADOOP_DAEMON_ROOT_LOGGER:-${HADOOP_LOGLEVEL},RFA}
|
||||
HADOOP_SECURITY_LOGGER=${HADOOP_SECURITY_LOGGER:-INFO,NullAppender}
|
||||
HADOOP_HEAPSIZE=${HADOOP_HEAPSIZE:-1024}
|
||||
HADOOP_SSH_OPTS=${HADOOP_SSH_OPTS:-"-o BatchMode=yes -o StrictHostKeyChecking=no -o ConnectTimeout=10s"}
|
||||
|
@ -88,6 +88,10 @@ call :updatepath %HADOOP_BIN_PATH%
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
|
||||
set hadoop-command=%1
|
||||
if not defined hadoop-command (
|
||||
@ -238,6 +242,10 @@ call :updatepath %HADOOP_BIN_PATH%
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if [%2] == [] goto :eof
|
||||
shift
|
||||
set _arguments=
|
||||
@ -256,7 +264,7 @@ call :updatepath %HADOOP_BIN_PATH%
|
||||
goto :eof
|
||||
|
||||
:print_usage
|
||||
@echo Usage: hadoop [--config confdir] COMMAND
|
||||
@echo Usage: hadoop [--config confdir] [--loglevel loglevel] COMMAND
|
||||
@echo where COMMAND is one of:
|
||||
@echo fs run a generic filesystem user client
|
||||
@echo version print the version
|
||||
|
@ -27,7 +27,8 @@ Overview
|
||||
hadoop script without any arguments prints the description for all
|
||||
commands.
|
||||
|
||||
Usage: <<<hadoop [--config confdir] [COMMAND] [GENERIC_OPTIONS] [COMMAND_OPTIONS]>>>
|
||||
Usage: <<<hadoop [--config confdir] [--loglevel loglevel] [COMMAND]
|
||||
[GENERIC_OPTIONS] [COMMAND_OPTIONS]>>>
|
||||
|
||||
Hadoop has an option parsing framework that employs parsing generic
|
||||
options as well as running classes.
|
||||
@ -37,6 +38,10 @@ Overview
|
||||
*-----------------------+---------------+
|
||||
| <<<--config confdir>>>| Overwrites the default Configuration directory. Default is <<<${HADOOP_HOME}/conf>>>.
|
||||
*-----------------------+---------------+
|
||||
| <<<--loglevel loglevel>>>| Overwrites the log level. Valid log levels are
|
||||
| | FATAL, ERROR, WARN, INFO, DEBUG, and TRACE.
|
||||
| | Default is INFO.
|
||||
*-----------------------+---------------+
|
||||
| GENERIC_OPTIONS | The common set of options supported by multiple commands.
|
||||
| COMMAND_OPTIONS | Various commands with their options are described in the following sections. The commands have been grouped into User Commands and Administration Commands.
|
||||
*-----------------------+---------------+
|
||||
|
@ -17,7 +17,8 @@
|
||||
|
||||
function hadoop_usage
|
||||
{
|
||||
echo "Usage: hdfs [--config confdir] [--daemon (start|stop|status)] COMMAND"
|
||||
echo "Usage: hdfs [--config confdir] [--daemon (start|stop|status)]"
|
||||
echo " [--loglevel loglevel] COMMAND"
|
||||
echo " where COMMAND is one of:"
|
||||
echo " balancer run a cluster balancing utility"
|
||||
echo " cacheadmin configure the HDFS cache"
|
||||
|
@ -34,6 +34,10 @@ if "%1" == "--config" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
|
||||
:main
|
||||
if exist %HADOOP_CONF_DIR%\hadoop-env.cmd (
|
||||
@ -165,6 +169,10 @@ goto :eof
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if [%2] == [] goto :eof
|
||||
shift
|
||||
set _hdfsarguments=
|
||||
@ -183,7 +191,7 @@ goto :eof
|
||||
goto :eof
|
||||
|
||||
:print_usage
|
||||
@echo Usage: hdfs [--config confdir] COMMAND
|
||||
@echo Usage: hdfs [--config confdir] [--loglevel loglevel] COMMAND
|
||||
@echo where COMMAND is one of:
|
||||
@echo dfs run a filesystem command on the file systems supported in Hadoop.
|
||||
@echo namenode -format format the DFS filesystem
|
||||
|
@ -26,8 +26,8 @@ HDFS Commands Guide
|
||||
hdfs script without any arguments prints the description for all
|
||||
commands.
|
||||
|
||||
Usage: <<<hdfs [--config confdir] [COMMAND] [GENERIC_OPTIONS]
|
||||
[COMMAND_OPTIONS]>>>
|
||||
Usage: <<<hdfs [--config confdir] [--loglevel loglevel] [COMMAND]
|
||||
[GENERIC_OPTIONS] [COMMAND_OPTIONS]>>>
|
||||
|
||||
Hadoop has an option parsing framework that employs parsing generic options
|
||||
as well as running classes.
|
||||
@ -38,6 +38,10 @@ HDFS Commands Guide
|
||||
| <<<--config confdir>>>| Overwrites the default Configuration directory.
|
||||
| | Default is <<<${HADOOP_HOME}/conf>>>.
|
||||
*-----------------------+---------------+
|
||||
| <<<--loglevel loglevel>>>| Overwrites the log level. Valid log levels are
|
||||
| | FATAL, ERROR, WARN, INFO, DEBUG, and TRACE.
|
||||
| | Default is INFO.
|
||||
*-----------------------+---------------+
|
||||
| GENERIC_OPTIONS | The common set of options supported by multiple
|
||||
| | commands. Full list is
|
||||
| | {{{../hadoop-common/CommandsManual.html#Generic_Options}here}}.
|
||||
|
@ -17,7 +17,8 @@
|
||||
|
||||
function hadoop_usage
|
||||
{
|
||||
echo "Usage: mapred [--config confdir] [--daemon (start|stop|status)] COMMAND"
|
||||
echo "Usage: mapred [--config confdir] [--daemon (start|stop|status)]"
|
||||
echo " [--loglevel loglevel] COMMAND"
|
||||
echo " where COMMAND is one of:"
|
||||
|
||||
echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive"
|
||||
|
@ -49,7 +49,7 @@ function hadoop_subproject_init
|
||||
HADOOP_PID_DIR="${HADOOP_MAPRED_PID_DIR:-$HADOOP_PID_DIR}"
|
||||
HADOOP_MAPRED_PID_DIR="${HADOOP_PID_DIR}"
|
||||
|
||||
HADOOP_ROOT_LOGGER="${HADOOP_MAPRED_ROOT_LOGGER:-INFO,console}"
|
||||
HADOOP_ROOT_LOGGER="${HADOOP_MAPRED_ROOT_LOGGER:-${HADOOP_LOGLEVEL},console}"
|
||||
HADOOP_MAPRED_ROOT_LOGGER="${HADOOP_ROOT_LOGGER}"
|
||||
|
||||
HADOOP_MAPRED_HOME="${HADOOP_MAPRED_HOME:-$HADOOP_PREFIX}"
|
||||
|
@ -37,6 +37,11 @@ if "%1" == "--config" (
|
||||
shift
|
||||
)
|
||||
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
|
||||
:main
|
||||
if exist %MAPRED_CONF_DIR%\mapred-env.cmd (
|
||||
call %MAPRED_CONF_DIR%\mapred-env.cmd
|
||||
@ -162,6 +167,10 @@ goto :eof
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
shift
|
||||
set _mapredarguments=
|
||||
:MakeCmdArgsLoop
|
||||
@ -184,7 +193,7 @@ goto :eof
|
||||
goto print_usage
|
||||
|
||||
:print_usage
|
||||
@echo Usage: mapred [--config confdir] COMMAND
|
||||
@echo Usage: mapred [--config confdir] [--loglevel loglevel] COMMAND
|
||||
@echo where COMMAND is one of:
|
||||
@echo job manipulate MapReduce jobs
|
||||
@echo queue get information regarding JobQueues
|
||||
|
@ -16,5 +16,5 @@
|
||||
|
||||
set HADOOP_JOB_HISTORYSERVER_HEAPSIZE=1000
|
||||
|
||||
set HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA
|
||||
set HADOOP_MAPRED_ROOT_LOGGER=%HADOOP_LOGLEVEL%,RFA
|
||||
|
||||
|
@ -28,7 +28,7 @@ MapReduce Commands Guide
|
||||
MapReduce commands are invoked by the <<<bin/mapred>>> script. Running the
|
||||
script without any arguments prints the description for all commands.
|
||||
|
||||
Usage: <<<mapred [--config confdir] COMMAND>>>
|
||||
Usage: <<<mapred [--config confdir] [--loglevel loglevel] COMMAND>>>
|
||||
|
||||
MapReduce has an option parsing framework that employs parsing generic
|
||||
options as well as running classes.
|
||||
@ -39,6 +39,9 @@ MapReduce Commands Guide
|
||||
| --config confdir | Overwrites the default Configuration directory. Default
|
||||
| | is $\{HADOOP_PREFIX\}/conf.
|
||||
*-------------------------+---------------------------------------------------+
|
||||
| --loglevel loglevel | Overwrites the log level. Valid log levels are FATAL,
|
||||
| | ERROR, WARN, INFO, DEBUG, and TRACE. Default is INFO.
|
||||
*-------------------------+---------------------------------------------------+
|
||||
| COMMAND COMMAND_OPTIONS | Various commands with their options are described
|
||||
| | in the following sections. The commands have been
|
||||
| | grouped into {{User Commands}} and
|
||||
|
@ -17,7 +17,8 @@
|
||||
|
||||
function hadoop_usage
|
||||
{
|
||||
echo "Usage: yarn [--config confdir] [--daemon (start|stop|status)] COMMAND"
|
||||
echo "Usage: yarn [--config confdir] [--daemon (start|stop|status)]"
|
||||
echo " [--loglevel loglevel] COMMAND"
|
||||
echo "where COMMAND is one of:"
|
||||
echo " application prints application(s) report/kill application"
|
||||
echo " applicationattempt prints applicationattempt(s) report"
|
||||
|
@ -58,7 +58,7 @@ function hadoop_subproject_init
|
||||
HADOOP_PID_DIR="${YARN_PID_DIR:-$HADOOP_PID_DIR}"
|
||||
YARN_PID_DIR="${HADOOP_PID_DIR}"
|
||||
|
||||
HADOOP_ROOT_LOGGER="${YARN_ROOT_LOGGER:-INFO,console}"
|
||||
HADOOP_ROOT_LOGGER="${YARN_ROOT_LOGGER:-${HADOOP_LOGLEVEL},console}"
|
||||
YARN_ROOT_LOGGER="${HADOOP_ROOT_LOGGER}"
|
||||
|
||||
HADOOP_YARN_HOME="${HADOOP_YARN_HOME:-$HADOOP_PREFIX}"
|
||||
|
@ -64,6 +64,10 @@ if "%1" == "--config" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
|
||||
:main
|
||||
if exist %YARN_CONF_DIR%\yarn-env.cmd (
|
||||
@ -273,6 +277,10 @@ goto :eof
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if "%1" == "--loglevel" (
|
||||
shift
|
||||
shift
|
||||
)
|
||||
if [%2] == [] goto :eof
|
||||
shift
|
||||
set _yarnarguments=
|
||||
@ -291,7 +299,7 @@ goto :eof
|
||||
goto :eof
|
||||
|
||||
:print_usage
|
||||
@echo Usage: yarn [--config confdir] COMMAND
|
||||
@echo Usage: yarn [--config confdir] [--loglevel loglevel] COMMAND
|
||||
@echo where COMMAND is one of:
|
||||
@echo resourcemanager run the ResourceManager
|
||||
@echo nodemanager run a nodemanager on each slave
|
||||
|
@ -42,7 +42,7 @@ if not defined YARN_POLICYFILE (
|
||||
)
|
||||
|
||||
if not defined YARN_ROOT_LOGGER (
|
||||
set YARN_ROOT_LOGGER=INFO,console
|
||||
set YARN_ROOT_LOGGER=%HADOOP_LOGLEVEL%,console
|
||||
)
|
||||
|
||||
set YARN_OPTS=%YARN_OPTS% -Dhadoop.log.dir=%YARN_LOG_DIR%
|
||||
|
@ -26,7 +26,7 @@ Yarn Commands
|
||||
without any arguments prints the description for all commands.
|
||||
|
||||
------
|
||||
Usage: yarn [--config confdir] COMMAND
|
||||
Usage: yarn [--config confdir] [--loglevel loglevel] COMMAND
|
||||
------
|
||||
|
||||
Yarn has an option parsing framework that employs parsing generic options as
|
||||
@ -38,6 +38,9 @@ Usage: yarn [--config confdir] COMMAND
|
||||
| --config confdir | Overwrites the default Configuration directory. Default
|
||||
| | is $\{HADOOP_PREFIX\}/conf.
|
||||
*---------------+--------------+
|
||||
| --loglevel loglevel | Overwrites the log level. Valid log levels are FATAL,
|
||||
| | ERROR, WARN, INFO, DEBUG, and TRACE. Default is INFO.
|
||||
*---------------+--------------+
|
||||
| COMMAND COMMAND_OPTIONS | Various commands with their options are described
|
||||
| | in the following sections. The commands have been
|
||||
| | grouped into {{User Commands}} and
|
||||
|
Loading…
Reference in New Issue
Block a user