Author: bmahe
Date: Tue May 22 19:29:31 2012
New Revision: 1341595
URL: http://svn.apache.org/viewvc?rev=1341595&view=rev
Log:
BIGTOP-597. Flume init scripts should not create the log and lock directories.
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.preinst
incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init?rev=1341595&r1=1341594&r2=1341595&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init Tue
May 22 19:29:31 2012
@@ -49,18 +49,23 @@ ERROR_PROGRAM_NOT_INSTALLED=5
FLUME_LOG_DIR=/var/log/flume
FLUME_CONF_DIR=/etc/flume/conf
-FLUME_RUN=/var/run/flume
+FLUME_RUN_DIR=/var/run/flume
FLUME_HOME=/usr/lib/flume
+FLUME_USER=flume
-LOCKFILE="/var/lock/subsys/flume-node"
+FLUME_LOCK_DIR="/var/lock/subsys"
+LOCKFILE="${FLUME_LOCK_DIR}/flume-node"
desc="Flume NG node daemon"
FLUME_CONF_FILE=${FLUME_CONF_FILE:-${FLUME_CONF_DIR}/flume.conf}
EXEC_PATH=/usr/bin/flume-ng
-FLUME_PID_FILE=${FLUME_RUN}/flume-node.pid
+FLUME_PID_FILE=${FLUME_RUN_DIR}/flume-node.pid
-install -d -m 0755 -o flume -g flume ${FLUME_RUN}
-USER=flume
+# These directories may be tmpfs and may or may not exist
+# depending on the OS (ex: /var/lock/subsys does not exist on debian/ubuntu)
+for dir in "$FLUME_RUN_DIR" "$FLUME_LOCK_DIR"; do
+ [ -d "${dir}" ] || install -d -m 0755 -o $FLUME_USER -g $FLUME_USER ${dir}
+done
DEFAULT_FLUME_NODE_NAME="agent"
FLUME_NODE_NAME=${FLUME_NODE_NAME:-${DEFAULT_FLUME_NODE_NAME}}
@@ -75,7 +80,7 @@ start() {
fi
log_success_msg "Starting $desc (flume-node): "
- /bin/su -s /bin/bash -c "/bin/bash -c 'echo \$\$ > ${FLUME_PID_FILE} && exec
${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE --name
$FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-node.log' &" $USER
+ /bin/su -s /bin/bash -c "/bin/bash -c 'echo \$\$ > ${FLUME_PID_FILE} && exec
${EXEC_PATH} node --conf $FLUME_CONF_DIR --conf-file $FLUME_CONF_FILE --name
$FLUME_NODE_NAME &>>${FLUME_LOG_DIR}/flume-node.log' &" $FLUME_USER
RETVAL=$?
[ $RETVAL -eq 0 ] && touch $LOCKFILE
return $RETVAL
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.preinst
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.preinst?rev=1341595&r1=1341594&r2=1341595&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.preinst
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.preinst Tue May
22 19:29:31 2012
@@ -42,8 +42,7 @@ case "$1" in
--shell /bin/false \
flume >/dev/null
fi
- install -d -m 0755 -o flume -g flume /var/run/flume
- install -d -m 0755 -o flume -g flume /var/log/flume
+ install -d -m 0755 -o flume -g flume /var/log/flume
;;
abort-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1341595&r1=1341594&r2=1341595&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Tue
May 22 19:29:31 2012
@@ -17,6 +17,7 @@
%define man_flume %{_mandir}
%define lib_flume /usr/lib/flume
%define log_flume /var/log/flume
+%define run_flume /var/run/flume
%if %{?suse_version:1}0
@@ -136,9 +137,8 @@ ln -s /usr/lib/hadoop/hadoop-auth.jar $R
%pre
getent group flume >/dev/null || groupadd -r flume
-getent passwd flume >/dev/null || useradd -c "Flume" -s /sbin/nologin -g flume
-r -d /var/run/flume flume 2> /dev/null || :
-%__install -d -o flume -g flume -m 0755 /var/run/flume
-%__install -d -o flume -g flume -m 0755 /var/log/flume
+getent passwd flume >/dev/null || useradd -c "Flume" -s /sbin/nologin -g flume
-r -d %{run_flume} flume 2> /dev/null || :
+%__install -d -o flume -g flume -m 0755 %{log_flume}
# Manage configuration symlink
%post
