This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new dfe772d HDDS-1912. start-ozone.sh fail due to ozone-config.sh not
found. Contributed by kevin su.
dfe772d is described below
commit dfe772d234c55dc35833e80e88d9659f15890490
Author: Márton Elek <e...@apache.org>
AuthorDate: Mon Aug 12 13:02:47 2019 +0200
HDDS-1912. start-ozone.sh fail due to ozone-config.sh not found.
Contributed by kevin su.
---
hadoop-ozone/common/src/main/bin/start-ozone.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hadoop-ozone/common/src/main/bin/start-ozone.sh
b/hadoop-ozone/common/src/main/bin/start-ozone.sh
index a05b9ae..9ddaab6 100755
--- a/hadoop-ozone/common/src/main/bin/start-ozone.sh
+++ b/hadoop-ozone/common/src/main/bin/start-ozone.sh
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
