浏览代码

HDDS-1912. start-ozone.sh fail due to ozone-config.sh not found. Contributed by kevin su.

Márton Elek 5 年之前
父节点
当前提交
dfe772d234
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      hadoop-ozone/common/src/main/bin/start-ozone.sh

+ 5 - 0
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
 if [[ -f "${HADOOP_LIBEXEC_DIR}/ozone-config.sh" ]]; then
   # shellcheck disable=SC1090
   # shellcheck disable=SC1090
   . "${HADOOP_LIBEXEC_DIR}/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
 else
   echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/ozone-config.sh." 2>&1
   echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/ozone-config.sh." 2>&1
   exit 1
   exit 1