BIGTOP-945. Service lock files need to match init script name
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/38eafa08 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/38eafa08 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/38eafa08 Branch: refs/heads/master Commit: 38eafa088167da44c26156f056623742e12aac01 Parents: 95d8631 Author: Sean Mackrory <[email protected]> Authored: Thu May 2 09:08:59 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Thu May 2 15:08:18 2013 -0700 ---------------------------------------------------------------------- .../src/common/hadoop/hadoop-hdfs-datanode.svc | 2 -- .../src/common/hadoop/hadoop-hdfs-journalnode.svc | 2 -- .../src/common/hadoop/hadoop-hdfs-namenode.svc | 2 -- .../hadoop/hadoop-hdfs-secondarynamenode.svc | 2 -- .../src/common/hadoop/hadoop-hdfs-zkfc.svc | 2 -- .../src/common/hadoop/hadoop-httpfs.svc | 2 -- .../hadoop/hadoop-mapreduce-historyserver.svc | 2 -- .../src/common/hadoop/hadoop-yarn-nodemanager.svc | 2 -- .../src/common/hadoop/hadoop-yarn-proxyserver.svc | 2 -- .../common/hadoop/hadoop-yarn-resourcemanager.svc | 2 -- bigtop-packages/src/common/hbase/hbase.svc | 2 -- .../src/common/hcatalog/hcatalog-server.svc | 2 -- .../src/common/hcatalog/webhcat-server.svc | 2 -- bigtop-packages/src/common/hive/hive-metastore.svc | 2 -- bigtop-packages/src/common/hive/hive-server.svc | 2 -- bigtop-packages/src/common/sqoop/sqoop-server.svc | 2 -- bigtop-packages/src/templates/init.d.tmpl | 4 ++-- 17 files changed, 2 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 5d4d71b..9f7ef8a 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc @@ -20,8 +20,6 @@ SVC_USER="hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" generate_start() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 2afafb8..431a99c 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc @@ -20,5 +20,3 @@ SVC_USER="hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 4fdcb3f..6ace898 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc @@ -20,8 +20,6 @@ SVC_USER="hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" generate_extra_commands() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 15d37f0..3164566 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc @@ -20,5 +20,3 @@ SVC_USER="hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 9b926f6..aaa1d28 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc @@ -20,5 +20,3 @@ SVC_USER="hdfs" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 f0ad005..def1c65 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc @@ -20,8 +20,6 @@ SVC_USER="$HADOOP_NAME" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/$DAEMON/conf" PIDFILE="/var/run/$DAEMON/hadoop-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" CHKCONFIG=${CHKCONFIG:-"2345 90 10"} CHKCONFIG="${CHKCONFIG%% *} 90 10" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 4271a61..ee4c4f7 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc @@ -20,6 +20,4 @@ SVC_USER="mapred" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-mapreduce/mapred-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" CHKCONFIG="2345 95 15" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 8926464..e5950cd 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc @@ -20,6 +20,4 @@ SVC_USER="yarn" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" CHKCONFIG="2345 95 15" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 db62c98..0cd2e1c 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc @@ -20,6 +20,4 @@ SVC_USER="yarn" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" CHKCONFIG="2345 95 15" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 658963b..f3b724e 100644 --- a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc +++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc @@ -20,6 +20,4 @@ SVC_USER="yarn" DAEMON_FLAGS="$HADOOP_NAME" CONF_DIR="/etc/hadoop/conf" PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hadoop-$HADOOP_NAME" CHKCONFIG="2345 95 15" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 c3a9d16..091c4d9 100644 --- a/bigtop-packages/src/common/hbase/hbase.svc +++ b/bigtop-packages/src/common/hbase/hbase.svc @@ -20,8 +20,6 @@ SVC_USER="hbase" DAEMON_FLAGS="" CONF_DIR="/etc/hbase/conf" PIDFILE="/var/run/hbase/hbase-${DAEMON}.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="${DAEMON}" generate_functions() { cat <<'__EOT__' http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 04aaaf2..029f5b1 100644 --- a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc +++ b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc @@ -20,5 +20,3 @@ DAEMON_FLAGS="" CONF_DIR="/etc/hcatalog/conf" # FIXME: HCATALOG-636 PIDFILE="/var/run/hcatalog/hcat.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="hcatalog-server" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 6f275f7..4d934c6 100644 --- a/bigtop-packages/src/common/hcatalog/webhcat-server.svc +++ b/bigtop-packages/src/common/hcatalog/webhcat-server.svc @@ -20,5 +20,3 @@ DAEMON_FLAGS="" CONF_DIR="/etc/webhcat/conf" # FIXME: HCATALOG-636 PIDFILE="/var/run/hcatalog/webhcat.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="webhcat-server" http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 10a9a62..d552f95 100644 --- a/bigtop-packages/src/common/hive/hive-metastore.svc +++ b/bigtop-packages/src/common/hive/hive-metastore.svc @@ -20,8 +20,6 @@ SVC_USER="hive" DAEMON_FLAGS="" CONF_DIR="/etc/hive/conf" PIDFILE="/var/run/hive/${DAEMON}.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="${DAEMON}" generate_start() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 049e814..8e1bce9 100644 --- a/bigtop-packages/src/common/hive/hive-server.svc +++ b/bigtop-packages/src/common/hive/hive-server.svc @@ -20,8 +20,6 @@ SVC_USER="hive" DAEMON_FLAGS="" CONF_DIR="/etc/hive/conf" PIDFILE="/var/run/hive/${DAEMON}.pid" -LOCKDIR="/var/lock/subsys" -LOCKFILE="${DAEMON}" generate_start() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 dba8970..916032d 100644 --- a/bigtop-packages/src/common/sqoop/sqoop-server.svc +++ b/bigtop-packages/src/common/sqoop/sqoop-server.svc @@ -20,8 +20,6 @@ SVC_USER="${SQOOP_USER:-sqoop}" DAEMON_FLAGS="" CONF_DIR="${SQOOP_CONFIG:-/etc/sqoop/conf}" PIDFILE="${SQOOP_PID:-/var/run/sqoop/sqoop-server-$SVC_USER.pid}" -LOCKDIR="/var/lock/subsys" -LOCKFILE="sqoop-server" generate_functions() { http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/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 9f51414..4801326 100644 --- a/bigtop-packages/src/templates/init.d.tmpl +++ b/bigtop-packages/src/templates/init.d.tmpl @@ -216,8 +216,8 @@ SVC_USER="$SVC_USER" DAEMON_FLAGS="$DAEMON_FLAGS" CONF_DIR="$CONF_DIR" PIDFILE="$PIDFILE" -LOCKDIR="$LOCKDIR" -LOCKFILE="\$LOCKDIR/$LOCKFILE" +LOCKDIR="/var/lock/subsys" +LOCKFILE="\$LOCKDIR/$DAEMON" install -d -m 0755 -o $SVC_USER -g $SVC_USER $(dirname $PIDFILE) 1>/dev/null 2>&1 || : [ -d "\$LOCKDIR" ] || install -d -m 0755 \$LOCKDIR 1>/dev/null 2>&1 || :
