HADOOP-11058. Missing HADOOP_CONF_DIR generates strange results (Masatake Iwasaki via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa505d1b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa505d1b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa505d1b Branch: refs/heads/HDFS-EC Commit: fa505d1bd9fec9bfca46e791372774df9deef164 Parents: e6ab984 Author: Allen Wittenauer <[email protected]> Authored: Tue Jan 6 12:02:03 2015 -0800 Committer: Zhe Zhang <[email protected]> Committed: Mon Jan 12 10:17:59 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-config.sh | 1 + .../hadoop-common/src/main/bin/hadoop-functions.sh | 9 +++++++++ 3 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa505d1b/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 4ceb77d..e7a2061 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -143,6 +143,9 @@ Trunk (Unreleased) HADOOP-10788. Rewrite kms to use new shell framework (John Smith via aw) + HADOOP-11058. Missing HADOOP_CONF_DIR generates strange results + (Masatake Iwasaki via aw) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa505d1b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh index 06fb0ef..d9fd6e6 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh @@ -169,6 +169,7 @@ hadoop_exec_userfuncs # hadoop_exec_hadooprc +hadoop_verify_confdir # do all the OS-specific startup bits here # this allows us to get a decent JAVA_HOME, http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa505d1b/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 799aad0..2d8e90e 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -92,6 +92,15 @@ function hadoop_find_confdir hadoop_debug "HADOOP_CONF_DIR=${HADOOP_CONF_DIR}" } +function hadoop_verify_confdir +{ + # Check only log4j.properties by default. + # --loglevel does not work without logger settings in log4j.log4j.properties. + if [[ ! -f "${HADOOP_CONF_DIR}/log4j.properties" ]]; then + hadoop_error "WARNING: log4j.properties is not found. HADOOP_CONF_DIR may be incomplete." + fi +} + function hadoop_exec_hadoopenv { # NOTE: This function is not user replaceable.
