Updated Branches: refs/heads/master 243fe032f -> 95abc29d5
BIGTOP-1006: Explicitly state the working directory to be used in init scripts instead of relying on user's home directories Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/80e3710e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/80e3710e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/80e3710e Branch: refs/heads/master Commit: 80e3710eb3bc2c5e419056a23063964e9366e213 Parents: 243fe03 Author: Mark Grover <[email protected]> Authored: Tue Jun 11 15:59:09 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Fri Jun 21 17:08:59 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc | 1 + .../src/common/hadoop/hadoop-hdfs-secondarynamenode.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-httpfs.svc | 1 + .../src/common/hadoop/hadoop-mapreduce-historyserver.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc | 1 + bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc | 1 + bigtop-packages/src/common/hbase/hbase.svc | 1 + bigtop-packages/src/common/hcatalog/hcatalog-server.svc | 2 +- bigtop-packages/src/common/hcatalog/webhcat-server.svc | 2 +- bigtop-packages/src/common/hive/hive-metastore.svc | 1 + bigtop-packages/src/common/hive/hive-server.svc | 1 + bigtop-packages/src/common/sqoop/sqoop-server.svc | 1 + bigtop-packages/src/templates/init.d.tmpl | 1 + 17 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc index 9f7ef8a..10d45e4 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-hdfs-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh" SVC_USER="hdfs" +WORKING_DIR="/var/lib/hadoop-hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc index 431a99c..a0a43a1 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-hdfs-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh" SVC_USER="hdfs" +WORKING_DIR="/var/lib/hadoop-hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc index 6ace898..f17014e 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-hdfs-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh" SVC_USER="hdfs" +WORKING_DIR="/var/lib/hadoop-hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc index 3164566..625ca3e 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-hdfs-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh" SVC_USER="hdfs" +WORKING_DIR="/var/lib/hadoop-hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc index aaa1d28..c055def 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-hdfs-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh" SVC_USER="hdfs" +WORKING_DIR="/var/lib/hadoop-hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc index def1c65..de4d6d2 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop-httpfs/sbin/httpfs.sh" SVC_USER="$HADOOP_NAME" +WORKING_DIR="/var/run/hadoop-httpfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/$DAEMON/conf" PIDFILE="/var/run/$DAEMON/hadoop-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc index ee4c4f7..b5b6935 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-mapreduce-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop-mapreduce/sbin/mr-jobhistory-daemon.sh" SVC_USER="mapred" +WORKING_DIR="/var/lib/hadoop-mapreduce" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-mapreduce/mapred-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc index e5950cd..925371a 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-yarn-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh" SVC_USER="yarn" +WORKING_DIR="/var/lib/hadoop-yarn" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc index 0cd2e1c..c97a21b 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-yarn-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh" SVC_USER="yarn" +WORKING_DIR="/var/lib/hadoop-yarn" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc index f3b724e..4c402d9 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc @@ -17,6 +17,7 @@ DAEMON="hadoop-yarn-$HADOOP_NAME" DESC="Hadoop $HADOOP_NAME" EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh" SVC_USER="yarn" +WORKING_DIR="/var/lib/hadoop-yarn" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hbase/hbase.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hbase/hbase.svc b/bigtop-packages/src/common/hbase/hbase.svc index 091c4d9..93b776d 100644 --- a/bigtop-packages/src/common/hbase/hbase.svc +++ b/bigtop-packages/src/common/hbase/hbase.svc @@ -17,6 +17,7 @@ DAEMON="hbase-@HBASE_DAEMON@" DESC="HBase @HBASE_DAEMON@ daemon" EXEC_PATH="/usr/lib/hbase/bin/hbase-daemon.sh" SVC_USER="hbase" +WORKING_DIR="/var/run/hbase" DAEMON_FLAGS="" CONF_DIR="/etc/hbase/conf" PIDFILE="/var/run/hbase/hbase-${DAEMON}.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hcatalog/hcatalog-server.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc index 2b67904..9a369a9 100644 --- a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc +++ b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc @@ -16,8 +16,8 @@ DAEMON="hcatalog-server" DESC="HCatalog server" EXEC_PATH="/usr/lib/hcatalog/sbin/hcat_server.sh" SVC_USER="hive" +WORKING_DIR="/var/run/hcatalog" DAEMON_FLAGS="" CONF_DIR="/etc/hcatalog/conf" # FIXME: HCATALOG-636 PIDFILE="/var/run/hcatalog/hcat.pid" -WORKING_DIR="/var/run/hcatalog" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hcatalog/webhcat-server.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hcatalog/webhcat-server.svc b/bigtop-packages/src/common/hcatalog/webhcat-server.svc index 6e54c55..0c26311 100644 --- a/bigtop-packages/src/common/hcatalog/webhcat-server.svc +++ b/bigtop-packages/src/common/hcatalog/webhcat-server.svc @@ -16,8 +16,8 @@ DAEMON="webhcat-server" DESC="WEBHCat server" EXEC_PATH="/usr/lib/hcatalog/sbin/webhcat_server.sh" SVC_USER="hive" +WORKING_DIR="/var/run/hcatalog" DAEMON_FLAGS="" CONF_DIR="/etc/webhcat/conf" # FIXME: HCATALOG-636 PIDFILE="/var/run/hcatalog/webhcat.pid" -WORKING_DIR="/var/run/hcatalog" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hive/hive-metastore.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hive/hive-metastore.svc b/bigtop-packages/src/common/hive/hive-metastore.svc index d552f95..66506f9 100644 --- a/bigtop-packages/src/common/hive/hive-metastore.svc +++ b/bigtop-packages/src/common/hive/hive-metastore.svc @@ -17,6 +17,7 @@ DAEMON="hive-metastore" DESC="Hive Metastore" EXEC_PATH="/usr/lib/hive/bin/hive" SVC_USER="hive" +WORKING_DIR="/var/lib/hive" DAEMON_FLAGS="" CONF_DIR="/etc/hive/conf" PIDFILE="/var/run/hive/${DAEMON}.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/hive/hive-server.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hive/hive-server.svc b/bigtop-packages/src/common/hive/hive-server.svc index 8e1bce9..cac9efa 100644 --- a/bigtop-packages/src/common/hive/hive-server.svc +++ b/bigtop-packages/src/common/hive/hive-server.svc @@ -17,6 +17,7 @@ DAEMON="hive-server" DESC="Hive Server" EXEC_PATH="/usr/lib/hive/bin/hive" SVC_USER="hive" +WORKING_DIR="/var/lib/hive" DAEMON_FLAGS="" CONF_DIR="/etc/hive/conf" PIDFILE="/var/run/hive/${DAEMON}.pid" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/common/sqoop/sqoop-server.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/sqoop/sqoop-server.svc b/bigtop-packages/src/common/sqoop/sqoop-server.svc index 916032d..26be910 100644 --- a/bigtop-packages/src/common/sqoop/sqoop-server.svc +++ b/bigtop-packages/src/common/sqoop/sqoop-server.svc @@ -17,6 +17,7 @@ DAEMON="sqoop-server" DESC="Sqoop Server" EXEC_PATH="/usr/bin/sqoop-server" SVC_USER="${SQOOP_USER:-sqoop}" +WORKING_DIR="/var/run/sqoop" DAEMON_FLAGS="" CONF_DIR="${SQOOP_CONFIG:-/etc/sqoop/conf}" PIDFILE="${SQOOP_PID:-/var/run/sqoop/sqoop-server-$SVC_USER.pid}" http://git-wip-us.apache.org/repos/asf/bigtop/blob/80e3710e/bigtop-packages/src/templates/init.d.tmpl ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/templates/init.d.tmpl b/bigtop-packages/src/templates/init.d.tmpl index 037b3ed..cd5e592 100644 --- a/bigtop-packages/src/templates/init.d.tmpl +++ b/bigtop-packages/src/templates/init.d.tmpl @@ -29,6 +29,7 @@ # EXEC_PATH="path to the upstream daemon management script" # SVC_USER="user to run this service as" # DAEMON_FLAGS="flags to be passed to the $EXEC_PATH" +# WORKING_DIR="working directory to cd into before starting the daemon" # CONF_DIR="path to the configuration directory" # PIDFILE="file holding a PID of the running daemon" # LOCKFILE="file signifying the service lock"
