You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2022/05/09 21:38:58 UTC
[ranger] branch master updated: RANGER-3718: Installation scripts in docker require use of exit codes during setup
This is an automated email from the ASF dual-hosted git repository.
abhay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 87a1dc459 RANGER-3718: Installation scripts in docker require use of exit codes during setup
87a1dc459 is described below
commit 87a1dc45944e10717f4d715eb3a8527ee4571d4f
Author: Abhishek Kumar <ab...@gmail.com>
AuthorDate: Mon May 9 14:38:40 2022 -0700
RANGER-3718: Installation scripts in docker require use of exit codes during setup
---
dev-support/ranger-docker/scripts/ranger-hadoop.sh | 20 +++++++++++++++-----
dev-support/ranger-docker/scripts/ranger-hbase.sh | 15 ++++++++++++---
dev-support/ranger-docker/scripts/ranger-hive.sh | 8 ++++++--
dev-support/ranger-docker/scripts/ranger-kafka.sh | 8 ++++++--
dev-support/ranger-docker/scripts/ranger-knox.sh | 15 ++++++++++++---
dev-support/ranger-docker/scripts/ranger-tagsync.sh | 17 +++++++++++++----
dev-support/ranger-docker/scripts/ranger-usersync.sh | 17 +++++++++++++----
dev-support/ranger-docker/scripts/ranger.sh | 17 +++++++++++++----
8 files changed, 90 insertions(+), 27 deletions(-)
diff --git a/dev-support/ranger-docker/scripts/ranger-hadoop.sh b/dev-support/ranger-docker/scripts/ranger-hadoop.sh
index 98eb51bf1..fca9b6f3e 100755
--- a/dev-support/ranger-docker/scripts/ranger-hadoop.sh
+++ b/dev-support/ranger-docker/scripts/ranger-hadoop.sh
@@ -32,12 +32,17 @@ then
echo "ssh" > /etc/pdsh/rcmd_default
- ${RANGER_SCRIPTS}/ranger-hadoop-setup.sh
- su -c "${HADOOP_HOME}/bin/hdfs namenode -format" hdfs
+ if "${RANGER_SCRIPTS}"/ranger-hadoop-setup.sh;
+ then
+ su -c "${HADOOP_HOME}/bin/hdfs namenode -format" hdfs
- CREATE_HDFS_DIR=true
- touch ${HADOOP_HOME}/.setupDone
+ CREATE_HDFS_DIR=true
+
+ touch "${HADOOP_HOME}"/.setupDone
+ else
+ echo "Ranger Hadoop Setup Script didn't complete proper execution."
+ fi
fi
su -c "${HADOOP_HOME}/sbin/start-dfs.sh" hdfs
@@ -51,4 +56,9 @@ fi
NAMENODE_PID=`ps -ef | grep -v grep | grep -i "org.apache.hadoop.hdfs.server.namenode.NameNode" | awk '{print $2}'`
# prevent the container from exiting
-tail --pid=$NAMENODE_PID -f /dev/null
+if [ -z "$NAMENODE_PID" ]
+then
+ echo "The NameNode process probably exited, no process id found!"
+else
+ tail --pid=$NAMENODE_PID -f /dev/null
+fi
\ No newline at end of file
diff --git a/dev-support/ranger-docker/scripts/ranger-hbase.sh b/dev-support/ranger-docker/scripts/ranger-hbase.sh
index 2092b24a9..ff27735dc 100755
--- a/dev-support/ranger-docker/scripts/ranger-hbase.sh
+++ b/dev-support/ranger-docker/scripts/ranger-hbase.sh
@@ -26,9 +26,13 @@ then
echo "ssh" > /etc/pdsh/rcmd_default
- ${RANGER_SCRIPTS}/ranger-hbase-setup.sh
- touch ${HBASE_HOME}/.setupDone
+ if "${RANGER_SCRIPTS}"/ranger-hbase-setup.sh;
+ then
+ touch "${HBASE_HOME}"/.setupDone
+ else
+ echo "Ranger Hbase Setup Script didn't complete proper execution."
+ fi
fi
su -c "${HBASE_HOME}/bin/start-hbase.sh" hbase
@@ -36,4 +40,9 @@ su -c "${HBASE_HOME}/bin/start-hbase.sh" hbase
HBASE_MASTER_PID=`ps -ef | grep -v grep | grep -i "org.apache.hadoop.hbase.master.HMaster" | awk '{print $2}'`
# prevent the container from exiting
-tail --pid=$HBASE_MASTER_PID -f /dev/null
+if [ -z "$HBASE_MASTER_PID" ]
+then
+ echo "The HBase process probably exited, no process id found!"
+else
+ tail --pid=$HBASE_MASTER_PID -f /dev/null
+fi
diff --git a/dev-support/ranger-docker/scripts/ranger-hive.sh b/dev-support/ranger-docker/scripts/ranger-hive.sh
index d696ddfa7..403eac9fb 100755
--- a/dev-support/ranger-docker/scripts/ranger-hive.sh
+++ b/dev-support/ranger-docker/scripts/ranger-hive.sh
@@ -30,9 +30,13 @@ then
echo "ssh" > /etc/pdsh/rcmd_default
- ${RANGER_SCRIPTS}/ranger-hive-setup.sh
- touch ${HIVE_HOME}/.setupDone
+ if "${RANGER_SCRIPTS}"/ranger-hive-setup.sh;
+ then
+ touch "${HIVE_HOME}"/.setupDone
+ else
+ echo "Ranger Hive Setup Script didn't complete proper execution."
+ fi
fi
cd "${HIVE_HOME}" || exit
diff --git a/dev-support/ranger-docker/scripts/ranger-kafka.sh b/dev-support/ranger-docker/scripts/ranger-kafka.sh
index 8be501c91..0f505eb4c 100755
--- a/dev-support/ranger-docker/scripts/ranger-kafka.sh
+++ b/dev-support/ranger-docker/scripts/ranger-kafka.sh
@@ -26,9 +26,13 @@ then
echo "ssh" > /etc/pdsh/rcmd_default
- ${RANGER_SCRIPTS}/ranger-kafka-setup.sh
- touch ${KAFKA_HOME}/.setupDone
+ if "${RANGER_SCRIPTS}"/ranger-kafka-setup.sh;
+ then
+ touch "${KAFKA_HOME}"/.setupDone
+ else
+ echo "Ranger Kafka Setup Script didn't complete proper execution."
+ fi
fi
su -c "cd ${KAFKA_HOME} && CLASSPATH=${KAFKA_HOME}/config ./bin/kafka-server-start.sh config/server.properties" kafka
diff --git a/dev-support/ranger-docker/scripts/ranger-knox.sh b/dev-support/ranger-docker/scripts/ranger-knox.sh
index 7548ae60f..fbcbb20b9 100755
--- a/dev-support/ranger-docker/scripts/ranger-knox.sh
+++ b/dev-support/ranger-docker/scripts/ranger-knox.sh
@@ -26,9 +26,13 @@ then
echo "ssh" > /etc/pdsh/rcmd_default
- ${RANGER_SCRIPTS}/ranger-knox-setup.sh
- touch ${KNOX_HOME}/.setupDone
+ if "${RANGER_SCRIPTS}"/ranger-knox-setup.sh;
+ then
+ touch "${KNOX_HOME}"/.setupDone
+ else
+ echo "Ranger Knox Setup Script didn't complete proper execution."
+ fi
fi
su -c "${KNOX_HOME}/bin/ldap.sh start" knox
@@ -38,4 +42,9 @@ su -c "${KNOX_HOME}/bin/gateway.sh start" knox
KNOX_GATEWAY_PID=`ps -ef | grep -v grep | grep -i "gateway.jar" | awk '{print $2}'`
# prevent the container from exiting
-tail --pid=$KNOX_GATEWAY_PID -f /dev/null
+if [ -z "$KNOX_GATEWAY_PID" ]
+then
+ echo "The Knox Gateway process probably exited, no process id found!"
+else
+ tail --pid=$KNOX_GATEWAY_PID -f /dev/null
+fi
diff --git a/dev-support/ranger-docker/scripts/ranger-tagsync.sh b/dev-support/ranger-docker/scripts/ranger-tagsync.sh
index 88fb52490..c676d3977 100755
--- a/dev-support/ranger-docker/scripts/ranger-tagsync.sh
+++ b/dev-support/ranger-docker/scripts/ranger-tagsync.sh
@@ -26,9 +26,13 @@ fi
if [ "${SETUP_RANGER}" == "true" ]
then
- cd ${RANGER_HOME}/tagsync && ./setup.sh
-
- touch ${RANGER_HOME}/.setupDone
+ cd "${RANGER_HOME}"/tagsync || exit
+ if ./setup.sh;
+ then
+ touch "${RANGER_HOME}"/.setupDone
+ else
+ echo "Ranger TagSync Setup Script didn't complete proper execution."
+ fi
fi
cd ${RANGER_HOME}/tagsync && ./ranger-tagsync-services.sh start
@@ -36,4 +40,9 @@ cd ${RANGER_HOME}/tagsync && ./ranger-tagsync-services.sh start
RANGER_TAGSYNC_PID=`ps -ef | grep -v grep | grep -i "org.apache.ranger.tagsync.process.TagSynchronizer" | awk '{print $2}'`
# prevent the container from exiting
-tail --pid=$RANGER_TAGSYNC_PID -f /dev/null
+if [ -z "$RANGER_TAGSYNC_PID" ]
+then
+ echo "The TagSync process probably exited, no process id found!"
+else
+ tail --pid=$RANGER_TAGSYNC_PID -f /dev/null
+fi
diff --git a/dev-support/ranger-docker/scripts/ranger-usersync.sh b/dev-support/ranger-docker/scripts/ranger-usersync.sh
index 63f94adb8..8e56ce5ff 100755
--- a/dev-support/ranger-docker/scripts/ranger-usersync.sh
+++ b/dev-support/ranger-docker/scripts/ranger-usersync.sh
@@ -26,9 +26,13 @@ fi
if [ "${SETUP_RANGER}" == "true" ]
then
- cd ${RANGER_HOME}/usersync && ./setup.sh
-
- touch ${RANGER_HOME}/.setupDone
+ cd "${RANGER_HOME}"/usersync || exit
+ if ./setup.sh;
+ then
+ touch "${RANGER_HOME}"/.setupDone
+ else
+ echo "Ranger UserSync Setup Script didn't complete proper execution."
+ fi
fi
cd ${RANGER_HOME}/usersync && ./start.sh
@@ -36,4 +40,9 @@ cd ${RANGER_HOME}/usersync && ./start.sh
RANGER_USERSYNC_PID=`ps -ef | grep -v grep | grep -i "org.apache.ranger.authentication.UnixAuthenticationService" | awk '{print $2}'`
# prevent the container from exiting
-tail --pid=$RANGER_USERSYNC_PID -f /dev/null
+if [ -z "$RANGER_USERSYNC_PID" ]
+then
+ echo "The UserSync process probably exited, no process id found!"
+else
+ tail --pid=$RANGER_USERSYNC_PID -f /dev/null
+fi
diff --git a/dev-support/ranger-docker/scripts/ranger.sh b/dev-support/ranger-docker/scripts/ranger.sh
index 6648724c8..666a07b22 100755
--- a/dev-support/ranger-docker/scripts/ranger.sh
+++ b/dev-support/ranger-docker/scripts/ranger.sh
@@ -26,9 +26,13 @@ fi
if [ "${SETUP_RANGER}" == "true" ]
then
- cd ${RANGER_HOME}/admin && ./setup.sh
-
- touch ${RANGER_HOME}/.setupDone
+ cd "${RANGER_HOME}"/admin || exit
+ if ./setup.sh;
+ then
+ touch "${RANGER_HOME}"/.setupDone
+ else
+ echo "Ranger Admin Setup Script didn't complete proper execution."
+ fi
fi
cd ${RANGER_HOME}/admin && ./ews/ranger-admin-services.sh start
@@ -43,4 +47,9 @@ fi
RANGER_ADMIN_PID=`ps -ef | grep -v grep | grep -i "org.apache.ranger.server.tomcat.EmbeddedServer" | awk '{print $2}'`
# prevent the container from exiting
-tail --pid=$RANGER_ADMIN_PID -f /dev/null
+if [ -z "$RANGER_ADMIN_PID" ]
+then
+ echo "Ranger Admin process probably exited, no process id found!"
+else
+ tail --pid=$RANGER_ADMIN_PID -f /dev/null
+fi