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 abe136f HDDS-5203. Allow suppressing deprecation warning for HADOOP_
variables (#2231)
abe136f is described below
commit abe136fdcfb37a118dcc3ff733b89ab1738d3b40
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue May 11 22:38:27 2021 +0200
HDDS-5203. Allow suppressing deprecation warning for HADOOP_ variables
(#2231)
---
hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot | 15 +++++++++++++++
hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh | 3 ++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
b/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
index 9745a6c..b36513b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
@@ -66,6 +66,21 @@ Picks up deprecated vars if valid
Should contain ${output} WARNING: HADOOP_HOME
Should contain ${output} WARNING: HADOOP_CONF_DIR
+Warning for deprecated vars can be suppressed
+ Set Environment Variable OZONE_DEPRECATION_WARNING false
+ Set Environment Variable HADOOP_HOME /opt/hadoop
+ Set Environment Variable HADOOP_LIBEXEC_DIR %{HADOOP_HOME}/libexec
+ Set Environment Variable HADOOP_CONF_DIR /etc/hadoop
+ Remove Environment Variable OZONE_HOME
+ Remove Environment Variable OZONE_CONF_DIR
+ ${output} = Execute ozone envvars
+ Should contain ${output}
OZONE_HOME='%{HADOOP_HOME}'
+ Should contain ${output}
HDDS_LIB_JARS_DIR='%{HADOOP_HOME}/share/ozone/lib'
+ Should contain ${output}
OZONE_CONF_DIR='/etc/hadoop'
+ Should Contain ${output}
OZONE_LIBEXEC_DIR='%{HADOOP_HOME}/libexec'
+ Should Not Contain ${output} WARNING: HADOOP_HOME
+ Should Not Contain ${output} WARNING:
HADOOP_CONF_DIR
+
Works with only OZONE_HOME defined
Remove Environment Variable HADOOP_HOME
Remove Environment Variable HADOOP_CONF_DIR
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
b/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
index fb1dd4c..886b084 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
@@ -2722,7 +2722,8 @@ function ozone_deprecate_envvar
local oldvar=$1
local newvar=$2
- if ozone_set_var_for_compatibility "$newvar" "$oldvar"; then
+ if ozone_set_var_for_compatibility "$newvar" "$oldvar" && \
+ [[ "${OZONE_DEPRECATION_WARNING:-true}" != "false" ]]; then
ozone_error "WARNING: ${oldvar} has been deprecated by ${newvar}."
fi
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
