This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 59bfb6a HDDS-4757. Unnecessary WARNING to set OZONE_CONF_DIR (#1849)
59bfb6a is described below
commit 59bfb6acbdfb1cb5bbd0bb7b6ed2cec2be419159
Author: Elek, Márton <[email protected]>
AuthorDate: Fri Jan 29 14:54:58 2021 +0100
HDDS-4757. Unnecessary WARNING to set OZONE_CONF_DIR (#1849)
---
hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot | 1 +
hadoop-ozone/dist/src/shell/ozone/ozone-config.sh | 1 -
hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
b/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
index d3b0891..9745a6c 100644
--- a/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
@@ -49,6 +49,7 @@ Find valid dirs
Should Contain ${output}
OZONE_CONF_DIR='/opt/hadoop/etc/hadoop'
Should Contain ${output}
OZONE_LIBEXEC_DIR='/opt/hadoop/libexec'
Should Contain ${output} WARNING: HADOOP_HOME
+ Should Not Contain ${output} WARNING:
OZONE_CONF_DIR
Should Not Contain ${output} WARNING:
HADOOP_CONF_DIR
Picks up deprecated vars if valid
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone-config.sh
b/hadoop-ozone/dist/src/shell/ozone/ozone-config.sh
index 894df1e..a617f87 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone-config.sh
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone-config.sh
@@ -71,7 +71,6 @@ ozone_exec_userfuncs
#
ozone_exec_user_env
-ozone_verify_confdir
ozone_deprecate_envvar HADOOP_SLAVES HADOOP_WORKERS
ozone_deprecate_envvar HADOOP_SLAVE_NAMES HADOOP_WORKER_NAMES
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
b/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
index bd5b5e5..7a921a4 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
@@ -653,7 +653,7 @@ function ozone_verify_confdir
{
# Check only log4j.properties by default.
# --loglevel does not work without logger settings in log4j.properties.
- [[ -f "${OZONE_CONF_DIR}/log4j.properties" ]]
+ [[ -f "${1:?ozone_verify_confir requires parameter}/log4j.properties" ]]
}
## @description Import the ozone-env.sh settings
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
