Skip to content

HDDS-4450. Cannot run ozone if HADOOP_HOME points to Hadoop install #1572

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
elek merged 2 commits into from
Nov 18, 2020
Merged

HDDS-4450. Cannot run ozone if HADOOP_HOME points to Hadoop install #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbaffae
HDDS-4450. Cannot run ozone if HADOOP_HOME points to Hadoop install
adoroszlai Nov 11, 2020
a171873
trigger new CI check
adoroszlai Nov 11, 2020
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
8 changes: 7 additions & 1 deletion hadoop-ozone/dist/src/shell/ozone/ozone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
# The name of the script being executed.
HADOOP_SHELL_EXECNAME="ozone"
MYNAME="${BASH_SOURCE-$0}"
bin=$(cd -P -- "$(dirname -- "${MYNAME}")" >/dev/null && pwd -P)
JVM_PID="$$"

## @description build up the hdfs command's usage text.
## @audience public
## @stability stable
Expand Down Expand Up @@ -233,7 +235,6 @@ function ozonecmd_case
if [[ -n "${HADOOP_HOME}" ]]; then
HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
else
bin=$(cd -P -- "$(dirname -- "${MYNAME}")" >/dev/null && pwd -P)
HADOOP_DEFAULT_LIBEXEC_DIR="${bin}/../libexec"
fi

Expand All @@ -243,6 +244,11 @@ HADOOP_NEW_CONFIG=true
if [[ -f "${HADOOP_LIBEXEC_DIR}/ozone-config.sh" ]]; then
# shellcheck source=./hadoop-ozone/common/src/main/bin/ozone-config.sh
. "${HADOOP_LIBEXEC_DIR}/ozone-config.sh"
elif [[ -f "${bin}/../libexec/ozone-config.sh" ]]; then
HADOOP_HOME="${bin}/../"
HADOOP_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
. "${HADOOP_LIBEXEC_DIR}/ozone-config.sh"
else
echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/ozone-config.sh." 2>&1
exit 1
Expand Down
5 changes: 5 additions & 0 deletions hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ HADOOP_NEW_CONFIG=true
if [[ -f "${HADOOP_LIBEXEC_DIR}/ozone-config.sh" ]]; then
# shellcheck disable=SC1090
. "${HADOOP_LIBEXEC_DIR}/ozone-config.sh"
elif [[ -f "${bin}/../libexec/ozone-config.sh" ]]; then
HADOOP_HOME="${bin}/../"
HADOOP_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
. "${HADOOP_LIBEXEC_DIR}/ozone-config.sh"
else
echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/ozone-config.sh." 2>&1
exit 1
Expand Down