[bigtop] branch master updated: BIGTOP-3292. Fix service configuration of sqoop2-server.

[oflebbe]

This is an automated email from the ASF dual-hosted git repository.

oflebbe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 9d296df  BIGTOP-3292. Fix service configuration of sqoop2-server.
     new fb43254  Merge pull request #581 from iwasakims/BIGTOP-3292
9d296df is described below

commit 9d296dff4cae23101ff4706c37bfba0216f7dc52
Author: Masatake Iwasaki <iwasak...@apache.org>
AuthorDate: Thu Jan 23 12:47:40 2020 +0000

    BIGTOP-3292. Fix service configuration of sqoop2-server.
---
 bigtop-packages/src/common/sqoop2/install_sqoop2.sh | 4 ++--
 bigtop-packages/src/common/sqoop2/sqoop-server.svc  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bigtop-packages/src/common/sqoop2/install_sqoop2.sh 
b/bigtop-packages/src/common/sqoop2/install_sqoop2.sh
index b875461..80986f1 100755
--- a/bigtop-packages/src/common/sqoop2/install_sqoop2.sh
+++ b/bigtop-packages/src/common/sqoop2/install_sqoop2.sh
@@ -158,8 +158,8 @@ for conf in web.xml tomcat-users.xml server.xml 
logging.properties context.xml c
 do
     install -m 0644 ${DIST_DIR}/server/conf/$conf 
${PREFIX}/${TOMCAT_CONF_DIR}.dist/conf/
 done
-sed -i -e "s|<Host |<Host workDir=\"/var/tmp/sqoop\" |" 
${PREFIX}/${TOMCAT_CONF_DIR}.dist/conf/server.xml
-sed -i -e "s|\${catalina\.base}/logs|/var/log/sqoop|"   
${PREFIX}/${TOMCAT_CONF_DIR}.dist/conf/logging.properties
+sed -i -e "s|<Host |<Host workDir=\"/var/tmp/sqoop2\" |" 
${PREFIX}/${TOMCAT_CONF_DIR}.dist/conf/server.xml
+sed -i -e "s|\${catalina\.base}/logs|/var/log/sqoop2|"   
${PREFIX}/${TOMCAT_CONF_DIR}.dist/conf/logging.properties
 cp -f ${EXTRA_DIR}/catalina.properties 
${PREFIX}/${TOMCAT_CONF_DIR}.dist/conf/catalina.properties
 install -d -m 0755 ${PREFIX}/${TOMCAT_CONF_DIR}.dist/WEB-INF
 mv $SQOOP_WEBAPPS/sqoop/WEB-INF/*.xml ${PREFIX}/${TOMCAT_CONF_DIR}.dist/WEB-INF
diff --git a/bigtop-packages/src/common/sqoop2/sqoop-server.svc 
b/bigtop-packages/src/common/sqoop2/sqoop-server.svc
index df12146..81093e5 100644
--- a/bigtop-packages/src/common/sqoop2/sqoop-server.svc
+++ b/bigtop-packages/src/common/sqoop2/sqoop-server.svc
@@ -47,7 +47,8 @@ start() {
   log_success_msg "Starting ${DESC}: "
 
   sqoop_env
-
+  mkdir -p "$(dirname "${PIDFILE}")"
+  chown ${SVC_USER} "$(dirname "${PIDFILE}")"
   su -s /bin/bash -c "cd ~/ && ${EXEC_PATH} start $DAEMON_FLAGS" $SVC_USER
 
   for second in {5..0}