From dfe772d234c55dc35833e80e88d9659f15890490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Mon, 12 Aug 2019 13:02:47 +0200 Subject: [PATCH] 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 a05b9ae7db..9ddaab64a7 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