Skip to content

HDDS-4757. Unnecessary WARNING to set OZONE_CONF_DIR #1849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Jan 29, 2021
Merged

HDDS-4757. Unnecessary WARNING to set OZONE_CONF_DIR #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ab7c27
HDDS-4757. Unnecessary WARNING to set OZONE_CONF_DIR
elek Jan 28, 2021
a516449
trigger new CI check
adoroszlai Jan 28, 2021
3394dc3
Add assertion in acceptance test
adoroszlai Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/shell/ozone/ozone-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down