Author: bmahe
Date: Sat Mar 31 00:37:01 2012
New Revision: 1307666
URL: http://svn.apache.org/viewvc?rev=1307666&view=rev
Log:
BIGTOP-494. Upgrade Apache Flume (incubating) to 1.1.0
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
incubator/bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
incubator/bigtop/trunk/bigtop.mk
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=1307666&r1=1307665&r2=1307666&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 Sat
Mar 31 00:37:01 2012
@@ -68,8 +68,7 @@ FLUME_NODE_NAME=${FLUME_NODE_NAME:-$HOST
start() {
[ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
log_success_msg "Starting $desc (flume-node): "
- export FLUME_PID_FILE
- /bin/su -s /bin/bash -c "${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' &" $USER &>>/dev/null
RETVAL=$?
[ $RETVAL -eq 0 ] && touch $LOCKFILE
return $RETVAL
@@ -83,19 +82,13 @@ stop() {
log_success_msg "Stopping $desc (flume-node): "
- # FLUME-919 will put an end to such extreme violence
FLUME_PID=`cat $FLUME_PID_FILE`
if [ -n $FLUME_PID ]; then
- FLUME_PID_GROUP=$(ps -o pgrp -p ${FLUME_PID} h)
-
- if [ -n $FLUME_PID_GROUP ]; then
- kill -TERM -${FLUME_PID_GROUP} &>/dev/null
- sleep 5
- kill -KILL -${FLUME_PID_GROUP} &>/dev/null
-
- rm -f $LOCKFILE $FLUME_PID_FILE
- fi
+ kill -TERM ${FLUME_PID} &>/dev/null
+ sleep 5
+ kill -KILL -${FLUME_PID} &>/dev/null
fi
+ rm -f $LOCKFILE $FLUME_PID_FILE
return 0
}
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh?rev=1307666&r1=1307665&r2=1307666&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/flume/install_flume.sh
Sat Mar 31 00:37:01 2012
@@ -105,8 +105,19 @@ install -d -m 0755 ${PREFIX}/${FLUME_DIR
(cd ${PREFIX}/${FLUME_DIR} &&
tar --strip-components=1 -xvzf
${BUILD_DIR}/flume-ng-dist/target/flume-ng-dist-*-dist.tar.gz)
-# Take out things we've installed elsewhere
-for x in flume-ng-* conf pom.xml CHANGELOG DEVNOTES DISCLAIMER LICENSE NOTICE
README RELEASE-NOTES; do
+# Take out useless things or we've installed elsewhere
+for x in flume-ng-* \
+ conf \
+ pom.xml \
+ CHANGELOG \
+ DEVNOTES \
+ DISCLAIMER \
+ LICENSE \
+ NOTICE \
+ README \
+ RELEASE-NOTES \
+ bin/ia64 \
+ bin/amd64; do
rm -rf ${PREFIX}/$FLUME_DIR/$x
done
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=1307666&r1=1307665&r2=1307666&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 Sat
Mar 31 00:37:01 2012
@@ -58,7 +58,7 @@ Group: Development/Libraries
Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
BuildArch: noarch
License: APL2
-Source0: flume-%{flume_base_version}.tar.gz
+Source0: apache-%{name}-%{flume_base_version}.tar.gz
Source1: do-component-build
Source2: install_%{name}.sh
Source3: %{name}-node.init
@@ -105,7 +105,7 @@ Requires: redhat-lsb
Flume is a reliable, scalable, and manageable distributed data collection
application for collecting data such as logs and delivering it to data stores
such as Hadoop's HDFS. It can efficiently collect, aggregate, and move large
amounts of log data. It has a simple, but flexible, architecture based on
streaming data flows. It is robust and fault tolerant with tunable reliability
mechanisms and many failover and recovery mechanisms. The system is centrally
managed and allows for intelligent dynamic management. It uses a simple
extensible data model that allows for online analytic applications.
%prep
-%setup -n %{name}-%{flume_base_version}
+%setup -n apache-%{name}-%{flume_base_version}
%build
env FLUME_VERSION=%{version} sh %{SOURCE1}
@@ -161,14 +161,20 @@ fi
%files
-%defattr(-,flume,flume)
-%config(noreplace) %{etc_flume}.empty
+%defattr(644,root,root,755)
%doc %{doc_flume}
-%attr(0755,root,root) %{bin_flume}
-%attr(0755,root,root) %{lib_flume}
+
+%dir %{etc_flume}.empty
+%dir %{lib_flume}
+%dir %{lib_flume}/bin
+%dir %{lib_flume}/lib
+
+%config(noreplace) %{etc_flume}.empty/*
+%attr(0755,root,root) %{bin_flume}/flume-ng
+%attr(0755,root,root) %{lib_flume}/bin/flume-ng
+%{lib_flume}/lib/*.jar
+%{lib_flume}/conf
%files node
%attr(0755,root,root)/%{initd_dir}/%{name}-node
-%dir %{lib_flume}/bin
-%dir %{lib_flume}
Modified: incubator/bigtop/trunk/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1307666&r1=1307665&r2=1307666&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Sat Mar 31 00:37:01 2012
@@ -127,11 +127,11 @@ $(eval $(call PACKAGE,mahout,MAHOUT))
FLUME_NAME=flume
FLUME_RELNOTES_NAME=Flume
FLUME_PKG_NAME=flume
-FLUME_BASE_VERSION=1.0.0-incubating
-FLUME_PKG_VERSION=1.0.0
+FLUME_BASE_VERSION=1.1.0-incubating
+FLUME_PKG_VERSION=1.1.0
FLUME_RELEASE_VERSION=1
-FLUME_TARBALL_DST=$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
-FLUME_TARBALL_SRC=$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
+FLUME_TARBALL_DST=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
+FLUME_TARBALL_SRC=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
FLUME_SITE=$(APACHE_MIRROR)/incubator/$(FLUME_NAME)/$(FLUME_NAME)-$(FLUME_BASE_VERSION)/
$(eval $(call PACKAGE,flume,FLUME))
