From fbaffae7d23e99362039a2cf2dcbf81bafaf5077 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 11 Nov 2020 09:51:39 +0100
Subject: [PATCH 1/2] HDDS-4450. Cannot run ozone if HADOOP_HOME points to
 Hadoop install

---
 hadoop-ozone/dist/src/shell/ozone/ozone         | 8 +++++++-
 hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone
index 9522d1fdd11c..c3c4012d112e 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -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
@@ -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
 
@@ -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
diff --git a/hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh b/hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh
index 60ea58ebe554..a1f5718be1bf 100755
--- a/hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh
+++ b/hadoop-ozone/dist/src/shell/ozone/stop-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

From a171873b8b8507383f14750fc2b628dd4989c27f Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 11 Nov 2020 12:25:17 +0100
Subject: [PATCH 2/2] trigger new CI check