This is an automated email from the ASF dual-hosted git repository.
mandarambawane pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 5c9942003 ATLAS-4846-Source-the-atlas-env-file-in-ATLAS-import.patch
5c9942003 is described below
commit 5c99420033e49ef237c8aa873b3fecec8cbeac8d
Author: pareshD <paresh.deva...@cloudera.com>
AuthorDate: Fri Apr 12 11:28:15 2024 +0530
ATLAS-4846-Source-the-atlas-env-file-in-ATLAS-import.patch
Signed-off-by: Mandar Ambawane <mandar.ambaw...@freestoneinfotech.com>
---
addons/hbase-bridge/src/bin/import-hbase.sh | 5 +++++
addons/hive-bridge/src/bin/import-hive.sh | 5 +++++
addons/impala-bridge/src/main/resources/import-impala.sh | 5 +++++
addons/kafka-bridge/src/bin/import-kafka.sh | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh
b/addons/hbase-bridge/src/bin/import-hbase.sh
index 8ae735034..aaf92ddd0 100644
--- a/addons/hbase-bridge/src/bin/import-hbase.sh
+++ b/addons/hbase-bridge/src/bin/import-hbase.sh
@@ -60,6 +60,11 @@ if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
fi
ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+if [ -d "${ATLAS_CONF_DIR}" ] && [ -f "${ATLAS_CONF_DIR}/atlas-env.sh" ]; then
+ #source the atlas-env.sh file, use the exported argument into atlas-jvm
+ source ${ATLAS_CONF_DIR}/atlas-env.sh
+fi
+
# log dir for applications
ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-/var/log/atlas}"
export ATLAS_LOG_DIR
diff --git a/addons/hive-bridge/src/bin/import-hive.sh
b/addons/hive-bridge/src/bin/import-hive.sh
index 951be5ba2..c64f6d1f0 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -55,6 +55,11 @@ if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
fi
ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+if [ -d "${ATLAS_CONF_DIR}" ] && [ -f "${ATLAS_CONF_DIR}/atlas-env.sh" ]; then
+ #source the atlas-env.sh file, use the exported argument into atlas-jvm
+ source ${ATLAS_CONF_DIR}/atlas-env.sh
+fi
+
# log dir for applications
ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-/var/log/atlas}"
export ATLAS_LOG_DIR
diff --git a/addons/impala-bridge/src/main/resources/import-impala.sh
b/addons/impala-bridge/src/main/resources/import-impala.sh
index b440f2d05..dc8e93fad 100644
--- a/addons/impala-bridge/src/main/resources/import-impala.sh
+++ b/addons/impala-bridge/src/main/resources/import-impala.sh
@@ -86,6 +86,11 @@ if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
fi
ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+if [ -d "${ATLAS_CONF_DIR}" ] && [ -f "${ATLAS_CONF_DIR}/atlas-env.sh" ]; then
+ #source the atlas-env.sh file, use the exported argument into atlas-jvm
+ source ${ATLAS_CONF_DIR}/atlas-env.sh
+fi
+
echo "Logging: ${ATLAS_LOG_DIR}/${ATLAS_LOG_FILE}"
echo "Log config: ${LOG_CONFIG}"
diff --git a/addons/kafka-bridge/src/bin/import-kafka.sh
b/addons/kafka-bridge/src/bin/import-kafka.sh
index 8fe27748a..9255a8151 100644
--- a/addons/kafka-bridge/src/bin/import-kafka.sh
+++ b/addons/kafka-bridge/src/bin/import-kafka.sh
@@ -62,6 +62,11 @@ if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
fi
ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+if [ -d "${ATLAS_CONF_DIR}" ] && [ -f "${ATLAS_CONF_DIR}/atlas-env.sh" ]; then
+ #source the atlas-env.sh file, use the exported argument into atlas-jvm
+ source ${ATLAS_CONF_DIR}/atlas-env.sh
+fi
+
# log dir for applications
ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-/var/log/atlas}"
export ATLAS_LOG_DIR
