You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ey...@apache.org on 2011/11/10 22:00:37 UTC
svn commit: r1200543 - in /incubator/ambari/trunk: ./ agent/
agent/src/packages/ agent/src/packages/deb/ambari-agent.control/
agent/src/packages/deb/hms-agent.control/ agent/src/packages/deb/init.d/
agent/src/packages/rpm/init.d/ agent/src/packages/rpm...
Author: eyang
Date: Thu Nov 10 21:00:36 2011
New Revision: 1200543
URL: http://svn.apache.org/viewvc?rev=1200543&view=rev
Log:
AMBARI-129. Rename agent package reference of HMS to Ambari. (Eric Yang)
Added:
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/
- copied from r1200445, incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/control
- copied, changed from r1200447, incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control
incubator/ambari/trunk/agent/src/packages/deb/init.d/ambari-agent
- copied, changed from r1200436, incubator/ambari/trunk/agent/src/packages/deb/init.d/hms-agent
incubator/ambari/trunk/agent/src/packages/rpm/init.d/ambari-agent
- copied, changed from r1200436, incubator/ambari/trunk/agent/src/packages/rpm/init.d/hms-agent
incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec
- copied, changed from r1200447, incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec
incubator/ambari/trunk/agent/src/packages/update-ambari-agent-env.sh
- copied, changed from r1200436, incubator/ambari/trunk/agent/src/packages/update-hms-agent-env.sh
Removed:
incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/
incubator/ambari/trunk/agent/src/packages/deb/init.d/hms-agent
incubator/ambari/trunk/agent/src/packages/rpm/init.d/hms-agent
incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec
incubator/ambari/trunk/agent/src/packages/update-hms-agent-env.sh
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/agent/pom.xml
incubator/ambari/trunk/agent/src/packages/build.xml
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/conffile
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postinst
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postrm
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/preinst
incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/prerm
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1200543&r1=1200542&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Nov 10 21:00:36 2011
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-129. Rename agent package reference of HMS to Ambari. (Eric Yang)
+
AMBARI-128. Improved ethtool handling. (Ahmed Fathalla via Eric Yang)
AMBARI-127. Fixed mailing list address. (Ahmed Fathalla via Eric Yang)
Modified: incubator/ambari/trunk/agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/pom.xml?rev=1200543&r1=1200542&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/pom.xml (original)
+++ incubator/ambari/trunk/agent/pom.xml Thu Nov 10 21:00:36 2011
@@ -22,7 +22,7 @@
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-agent</artifactId>
<packaging>pom</packaging>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.0</version>
<name>agent</name>
<description>Ambari Agent</description>
@@ -62,7 +62,7 @@
<executions>
<execution>
<configuration>
- <executable>python</executable>
+ <executable>python2.6</executable>
<workingDirectory>src/test/python</workingDirectory>
<arguments>
<argument>unitTests.py</argument>
Modified: incubator/ambari/trunk/agent/src/packages/build.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/build.xml?rev=1200543&r1=1200542&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/build.xml (original)
+++ incubator/ambari/trunk/agent/src/packages/build.xml Thu Nov 10 21:00:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="hms agent packaging">
+<project name="Ambari agent packaging">
<target name="move-tarball">
<move todir="${project.build.directory}">
<fileset dir="${project.build.directory}/${final.name}/dist">
@@ -30,13 +30,13 @@
<taskdef name="deb"
classname="org.vafer.jdeb.ant.DebAntTask">
</taskdef>
- <mkdir dir="${project.build.directory}/deb/hms-agent.control" />
- <copy todir="${project.build.directory}/deb/hms-agent.control">
- <fileset dir="${basedir}/src/packages/deb/hms-agent.control">
+ <mkdir dir="${project.build.directory}/deb/ambari-agent.control" />
+ <copy todir="${project.build.directory}/deb/ambari-agent.control">
+ <fileset dir="${basedir}/src/packages/deb/ambari-agent.control">
<exclude name="control" />
</fileset>
</copy>
- <copy file="src/packages/deb/hms-agent.control/control" todir="${basedir}/target/deb/hms-agent.control">
+ <copy file="src/packages/deb/ambari-agent.control/control" todir="${basedir}/target/deb/ambari-agent.control">
<filterchain>
<replacetokens>
<token key="version" value="${project.version}" />
@@ -49,12 +49,12 @@
</fileset>
</path>
<property name="source.file" refid="source.id"/>
- <deb destfile="${project.build.directory}/${artifactId}_${project.version}-${package.release}_${os.arch}.deb" control="${basedir}/target/deb/hms-agent.control">
+ <deb destfile="${project.build.directory}/${artifactId}_${project.version}-${package.release}_${os.arch}.deb" control="${basedir}/target/deb/ambari-agent.control">
<data src="${source.file}">
<mapper type="prefix" strip="1" prefix="${package.prefix}" />
<include name="**" />
</data>
- <tarfileset dir="${basedir}/src/packages/deb/init.d" filemode="755" prefix="${package.prefix}/share/hms/sbin">
+ <tarfileset dir="${basedir}/src/packages/deb/init.d" filemode="755" prefix="${package.prefix}/share/ambari/sbin">
<exclude name=".svn" />
<include name="**" />
</tarfileset>
@@ -68,20 +68,22 @@
</fileset>
</path>
<property name="source.file" refid="source.id"/>
- <delete dir="${project.build.directory}/rpm/hms/buildroot" />
- <mkdir dir="${project.build.directory}/rpm/hms/SOURCES" />
- <mkdir dir="${project.build.directory}/rpm/hms/BUILD" />
- <mkdir dir="${project.build.directory}/rpm/hms/RPMS" />
- <mkdir dir="${project.build.directory}/rpm/hms/buildroot" />
- <copy file="${source.file}" tofile="${project.build.directory}/rpm/hms/SOURCES/${final.name}.tar.gz" />
- <copy file="src/packages/rpm/spec/hms-agent.spec" todir="target/rpm/hms/SPECS">
+ <echo message="${final.name}.linux*.tar.gz"/>
+ <echo message="${source.file}"/>
+ <delete dir="${project.build.directory}/rpm/ambari/buildroot" />
+ <mkdir dir="${project.build.directory}/rpm/ambari/SOURCES" />
+ <mkdir dir="${project.build.directory}/rpm/ambari/BUILD" />
+ <mkdir dir="${project.build.directory}/rpm/ambari/RPMS" />
+ <mkdir dir="${project.build.directory}/rpm/ambari/buildroot" />
+ <copy file="${source.file}" tofile="${project.build.directory}/rpm/ambari/SOURCES/${final.name}.tar.gz" />
+ <copy file="src/packages/rpm/spec/ambari-agent.spec" todir="target/rpm/ambari/SPECS">
<filterchain>
<replacetokens>
<token key="final.name" value="${final.name}" />
<token key="version" value="${project.version}" />
<token key="package.name" value="${source.file}" />
<token key="package.release" value="${package.release}" />
- <token key="package.build.dir" value="${project.build.directory}/rpm/hms/BUILD" />
+ <token key="package.build.dir" value="${project.build.directory}/rpm/ambari/BUILD" />
<token key="package.prefix" value="${package.prefix}" />
<token key="package.conf.dir" value="${package.conf.dir}" />
<token key="package.log.dir" value="${package.log.dir}" />
@@ -89,9 +91,9 @@
</replacetokens>
</filterchain>
</copy>
- <rpm specFile="hms-agent.spec" command="-bb" topDir="${project.build.directory}/rpm/hms" cleanBuildDir="true" failOnError="true"/>
+ <rpm specFile="ambari-agent.spec" command="-bb" topDir="${project.build.directory}/rpm/ambari" cleanBuildDir="true" failOnError="true"/>
<copy todir="${project.build.directory}" flatten="true">
- <fileset dir="${project.build.directory}/rpm/hms/RPMS">
+ <fileset dir="${project.build.directory}/rpm/ambari/RPMS">
<include name="**/*.rpm" />
</fileset>
</copy>
Modified: incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/conffile
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/conffile?rev=1200543&r1=1200445&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/conffile (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/conffile Thu Nov 10 21:00:36 2011
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-/etc/hms/hms-env.sh
+/etc/ambari/ambari-env.sh
Copied: incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/control (from r1200447, incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/control?p2=incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/control&p1=incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control&r1=1200447&r2=1200543&rev=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/control Thu Nov 10 21:00:36 2011
@@ -12,12 +12,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-Package: hms-agent
+Package: ambari-agent
Version: @version@
Section: misc
Priority: optional
Architecture: all
Depends: python, ethtool
-Maintainer: Apache Software Foundation <hm...@incubator.apache.org>
-Description: Hadoop Management System Agent manage software installation and configuration for Hadoop software stack.
+Maintainer: Apache Software Foundation <am...@incubator.apache.org>
+Description: Ambari Agent manage software installation and configuration for Hadoop software stack.
Distribution: development
Modified: incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postinst
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postinst?rev=1200543&r1=1200445&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postinst (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postinst Thu Nov 10 21:00:36 2011
@@ -15,10 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bash /usr/sbin/update-hms-env.sh \
+bash /usr/sbin/update-ambari-env.sh \
--prefix=/usr \
--bin-dir=/usr/bin \
- --conf-dir=/etc/hms \
- --log-dir=/var/log/hms \
- --pid-dir=/var/run/hms
+ --conf-dir=/etc/ambari \
+ --log-dir=/var/log/ambari \
+ --pid-dir=/var/run/ambari
Modified: incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postrm
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postrm?rev=1200543&r1=1200445&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postrm (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/postrm Thu Nov 10 21:00:36 2011
@@ -15,6 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-/usr/sbin/userdel hms 2> /dev/null >/dev/null
+/usr/sbin/userdel ambari 2> /dev/null >/dev/null
exit 0
Modified: incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/preinst
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/preinst?rev=1200543&r1=1200445&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/preinst (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/preinst Thu Nov 10 21:00:36 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-getent group hadoop 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hadoop
+getent group hadoop 2>/dev/null >/dev/null || /usr/sbin/groupadd -g 123 -r hadoop
-/usr/sbin/useradd --comment "Hadoop Management System" --shell /bin/bash -M -r --groups hadoop --home /home/hms hms 2> /dev/null || :
+/usr/sbin/useradd --comment "Ambari" -u 210 --shell /bin/bash -M -r --groups hadoop --home /home/ambari ambari 2> /dev/null || :
Modified: incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/prerm
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/prerm?rev=1200543&r1=1200445&r2=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/prerm (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/ambari-agent.control/prerm Thu Nov 10 21:00:36 2011
@@ -15,12 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-/etc/init.d/hms-agent stop 2>/dev/null >/dev/null
-bash /usr/sbin/update-hms-env.sh \
+/etc/init.d/ambari-agent stop 2>/dev/null >/dev/null
+bash /usr/sbin/update-ambari-env.sh \
--prefix=/usr \
--bin-dir=/usr/bin \
- --conf-dir=/etc/hms \
- --log-dir=/var/log/hms \
- --pid-dir=/var/run/hms \
+ --conf-dir=/etc/ambari \
+ --log-dir=/var/log/ambari \
+ --pid-dir=/var/run/ambari \
--uninstal
Copied: incubator/ambari/trunk/agent/src/packages/deb/init.d/ambari-agent (from r1200436, incubator/ambari/trunk/agent/src/packages/deb/init.d/hms-agent)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/init.d/ambari-agent?p2=incubator/ambari/trunk/agent/src/packages/deb/init.d/ambari-agent&p1=incubator/ambari/trunk/agent/src/packages/deb/init.d/hms-agent&r1=1200436&r2=1200543&rev=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/init.d/hms-agent (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/init.d/ambari-agent Thu Nov 10 21:00:36 2011
@@ -16,7 +16,7 @@
# limitations under the License.
### BEGIN INIT INFO
-# Provides: hms-agent
+# Provides: ambari-agent
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
@@ -26,12 +26,12 @@
set -e
-# /etc/init.d/hms-agent: start and stop the Apache HMS Agent daemon
+# /etc/init.d/ambari-agent: start and stop the Apache HMS Agent daemon
umask 022
-if test -f /etc/default/hms-env.sh; then
- . /etc/default/hms-env.sh
+if test -f /etc/default/ambari-env.sh; then
+ . /etc/default/ambari-env.sh
fi
. /lib/lsb/init-functions
@@ -42,13 +42,13 @@ run_by_init() {
}
check_for_no_start() {
- # forget it if we're trying to start, and /etc/hms/hms-agent_not_to_be_run exists
- if [ -e /etc/hms/hms-agent_not_to_be_run ]; then
+ # forget it if we're trying to start, and /etc/ambari/ambari-agent_not_to_be_run exists
+ if [ -e /etc/ambari/ambari-agent_not_to_be_run ]; then
if [ "$1" = log_end_msg ]; then
log_end_msg 0
fi
if ! run_by_init; then
- log_action_msg "Apache HMS Agent not in use (/etc/hms/hms-agent_not_to_be_run)"
+ log_action_msg "Apache HMS Agent not in use (/etc/ambari/ambari-agent_not_to_be_run)"
fi
exit 0
fi
@@ -59,16 +59,16 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/u
case "$1" in
start)
check_for_no_start
- log_daemon_msg "Starting Apache HMS Agent" "hms-agent"
- if start-stop-daemon --start --quiet --oknodo --pidfile ${HMS_PID_DIR}/hms-agent.pid -x /usr/bin/hms-agent; then
+ log_daemon_msg "Starting Apache HMS Agent" "ambari-agent"
+ if start-stop-daemon --start --quiet --oknodo --pidfile ${HMS_PID_DIR}/ambari-agent.pid -x /usr/bin/ambari-agent; then
log_end_msg 0
else
log_end_msg 1
fi
;;
stop)
- log_daemon_msg "Stopping Apache HMS Agent" "hms-agent"
- if start-stop-daemon --stop --quiet --oknodo --pidfile ${HMS_PID_DIR}/hms-agent.pid; then
+ log_daemon_msg "Stopping Apache HMS Agent" "ambari-agent"
+ if start-stop-daemon --stop --quiet --oknodo --pidfile ${HMS_PID_DIR}/ambari-agent.pid; then
log_end_msg 0
else
log_end_msg 1
@@ -77,10 +77,10 @@ case "$1" in
restart)
check_privsep_dir
- log_daemon_msg "Restarting Apache HMS Agent" "hms-agent"
- start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile ${HMS_PID_DIR}/hms-agent.pid
+ log_daemon_msg "Restarting Apache HMS Agent" "ambari-agent"
+ start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile ${HMS_PID_DIR}/ambari-agent.pid
check_for_no_start log_end_msg
- if start-stop-daemon --start --quiet --oknodo --pidfile ${HMS_PID_DIR}/hms-agent.pid -x /usr/bin/hms-agent; then
+ if start-stop-daemon --start --quiet --oknodo --pidfile ${HMS_PID_DIR}/ambari-agent.pid -x /usr/bin/ambari-agent; then
log_end_msg 0
else
log_end_msg 1
@@ -88,11 +88,11 @@ case "$1" in
;;
status)
- status_of_proc -p ${HMS_PID_DIR}/hms-agent.pid /usr/bin/hms-agent hms-agent && exit 0 || exit $?
+ status_of_proc -p ${HMS_PID_DIR}/ambari-agent.pid /usr/bin/ambari-agent ambari-agent && exit 0 || exit $?
;;
*)
- log_action_msg "Usage: /etc/init.d/hms-agent {start|stop|restart|status}"
+ log_action_msg "Usage: /etc/init.d/ambari-agent {start|stop|restart|status}"
exit 1
esac
Copied: incubator/ambari/trunk/agent/src/packages/rpm/init.d/ambari-agent (from r1200436, incubator/ambari/trunk/agent/src/packages/rpm/init.d/hms-agent)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/rpm/init.d/ambari-agent?p2=incubator/ambari/trunk/agent/src/packages/rpm/init.d/ambari-agent&p1=incubator/ambari/trunk/agent/src/packages/rpm/init.d/hms-agent&r1=1200436&r2=1200543&rev=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/rpm/init.d/hms-agent (original)
+++ incubator/ambari/trunk/agent/src/packages/rpm/init.d/ambari-agent Thu Nov 10 21:00:36 2011
@@ -22,27 +22,27 @@
# description: HBase master
source /etc/rc.d/init.d/functions
-source /etc/default/hms-agent-env.sh
+source /etc/default/ambari-env.sh
RETVAL=0
-PIDFILE="${HMS_PID_DIR}/hms-agent.pid"
-desc="HMS agent daemon"
+PIDFILE="${HMS_PID_DIR}/ambari-agent.pid"
+desc="Ambari agent daemon"
start() {
- echo -n $"Starting $desc (hms-agent): "
- daemon /usr/bin/hms-agent
+ echo -n $"Starting $desc (ambari-agent): "
+ daemon /usr/bin/ambari-agent
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/hms-agent
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ambari-agent
return $RETVAL
}
stop() {
- echo -n $"Stopping $desc (hms-agent): "
- daemon /usr/bin/hms-agent stop
+ echo -n $"Stopping $desc (ambari-agent): "
+ daemon /usr/bin/ambari-agent stop
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/hms-agent $PIDFILE
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ambari-agent $PIDFILE
}
restart() {
@@ -51,12 +51,12 @@ restart() {
}
checkstatus(){
- status -p $PIDFILE hms-agent
+ status -p $PIDFILE ambari-agent
RETVAL=$?
}
condrestart(){
- [ -e /var/lock/subsys/hms-agent ] && restart || :
+ [ -e /var/lock/subsys/ambari-agent ] && restart || :
}
case "$1" in
Copied: incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec (from r1200447, incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec?p2=incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec&p1=incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec&r1=1200447&r2=1200543&rev=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec (original)
+++ incubator/ambari/trunk/agent/src/packages/rpm/spec/ambari-agent.spec Thu Nov 10 21:00:36 2011
@@ -17,7 +17,7 @@
# RPM Spec file for HBase version @version@
#
-%define name hms-agent
+%define name ambari-agent
%define version @version@
%define release @package.release@
@@ -34,7 +34,7 @@
%define _man_dir %{_prefix}/man
%define _pid_dir @package.pid.dir@
%define _sbin_dir %{_prefix}/sbin
-%define _share_dir %{_prefix}/share/hms
+%define _share_dir %{_prefix}/share/ambari
%define _src_dir %{_prefix}/src
%define _var_dir %{_prefix}/var/lib
@@ -44,7 +44,7 @@
Summary: Hadoop Management System Agent
License: Apache License, Version 2.0
-URL: http://incubator.apache.org/hms
+URL: http://incubator.apache.org/ambari
Vendor: Apache Software Foundation
Group: Development/Libraries
Name: %{name}
@@ -58,10 +58,10 @@ Prefix: %{_pid_dir}
Buildroot: %{_build_dir}
Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, transmission-cli, zkpython, zookeeper-lib, BitTorrent-bencode, mimerender, simplejson, mimeparse, web.py, python-setuptools, libevent >= 2.0.10, avahi-tools, python-iniparse, /sbin/ethtool
AutoReqProv: no
-Provides: hms-agent
+Provides: ambari-agent
%description
-Hadoop Management System Agent manage software installation and configuration for Hadoop software stack.
+Ambari Agent manage software installation and configuration for Hadoop software stack.
%prep
@@ -85,32 +85,27 @@ mkdir -p ${RPM_BUILD_DIR}%{_log_dir}
mkdir -p ${RPM_BUILD_DIR}%{_conf_dir}
mkdir -p ${RPM_BUILD_DIR}/etc/init.d
-cp ${RPM_BUILD_DIR}/../../../../src/packages/rpm/init.d/hms-agent ${RPM_BUILD_DIR}/etc/init.d/hms-agent
-chmod 0755 ${RPM_BUILD_DIR}/etc/init.d/hms-agent
+cp ${RPM_BUILD_DIR}/../../../../src/packages/rpm/init.d/ambari-agent ${RPM_BUILD_DIR}/etc/init.d/ambari-agent
+chmod 0755 ${RPM_BUILD_DIR}/etc/init.d/ambari-agent
%preun
-rm -rf /etc/default/hms-agent-env.sh
+rm -rf /etc/default/ambari-agent-env.sh
%pre
+getent group hadoop 2>/dev/null >/dev/null || /usr/sbin/groupadd -g 123 -r hadoop
+/usr/sbin/useradd --comment "Ambari" -u 210 --shell /bin/bash -M -r --groups hadoop --home /home/ambari ambari 2> /dev/null || :
%post
mkdir -p ${RPM_INSTALL_PREFIX2}
mkdir -p ${RPM_INSTALL_PREFIX3}
-echo "HMS_LOG_DIR=${RPM_INSTALL_PREFIX2}" > /etc/default/hms-agent-env.sh
-echo "HMS_PID_DIR=${RPM_INSTALL_PREFIX3}" >> /etc/default/hms-agent-env.sh
-mkdir -p /home/hms/var/tmp
-mkdir -p /home/hms/var/cache/downloads
-mkdir -p /home/hms/apps
-
-#${RPM_INSTALL_PREFIX0}/share/hms/sbin/update-hms-agent-env.sh \
-# --prefix=${RPM_INSTALL_PREFIX0} \
-# --bin-dir=${RPM_INSTALL_PREFIX0}/bin \
-# --conf-dir=${RPM_INSTALL_PREFIX1} \
-# --log-dir=${RPM_INSTALL_PREFIX2} \
-# --pid-dir=${RPM_INSTALL_PREFIX3}
+echo "AMBARI_LOG_DIR=${RPM_INSTALL_PREFIX2}" > /etc/default/ambari-agent-env.sh
+echo "AMBARI_PID_DIR=${RPM_INSTALL_PREFIX3}" >> /etc/default/ambari-agent-env.sh
+mkdir -p /home/ambari/var/tmp
+mkdir -p /home/ambari/var/cache/downloads
+mkdir -p /home/ambari/apps
%files
%defattr(-,root,root)
%{_prefix}
-/etc/init.d/hms-agent
+/etc/init.d/ambari-agent
%config %{_conf_dir}
Copied: incubator/ambari/trunk/agent/src/packages/update-ambari-agent-env.sh (from r1200436, incubator/ambari/trunk/agent/src/packages/update-hms-agent-env.sh)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/update-ambari-agent-env.sh?p2=incubator/ambari/trunk/agent/src/packages/update-ambari-agent-env.sh&p1=incubator/ambari/trunk/agent/src/packages/update-hms-agent-env.sh&r1=1200436&r2=1200543&rev=1200543&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/update-hms-agent-env.sh (original)
+++ incubator/ambari/trunk/agent/src/packages/update-ambari-agent-env.sh Thu Nov 10 21:00:36 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# This script configures hms-agent-env.sh and symlinkis directories for
+# This script configures ambari-agent-env.sh and symlinkis directories for
# relocating RPM locations.
usage() {
@@ -27,8 +27,8 @@ usage: $0 <parameters>
Optional parameters:
--arch=i386 OS Architecture
--bin-dir=PREFIX/bin Executable directory
- --conf-dir=/etc/hms Configuration directory
- --log-dir=/var/log/hms Log directory
+ --conf-dir=/etc/ambari Configuration directory
+ --log-dir=/var/log/ambari Log directory
--pid-dir=/var/run PID file location
"
exit 1
@@ -115,15 +115,15 @@ if [ "${UNINSTALL}" -eq "1" ]; then
rm -f ${BIN_DIR}/${var}
done
fi
- if [ -f /etc/default/hms-agent-env.sh ]; then
- rm -f /etc/default/hms-agent-env.sh
+ if [ -f /etc/default/ambari-agent-env.sh ]; then
+ rm -f /etc/default/ambari-agent-env.sh
fi
if [ "${CONF_DIR}" != "${PREFIX}/conf" ]; then
rm -f ${PREFIX}/conf
fi
- rm -f ${PREFIX}/sbin/hms-agent
- rm -f /etc/init.d/hms-agent
+ rm -f ${PREFIX}/sbin/ambari-agent
+ rm -f /etc/init.d/ambari-agent
else
# Create symlinks
@@ -136,21 +136,21 @@ else
ln -sf ${CONF_DIR} ${PREFIX}/conf
fi
- chmod 755 ${PREFIX}/share/hms/sbin/*
+ chmod 755 ${PREFIX}/share/ambari/sbin/*
- ln -sf ${PREFIX}/sbin/hms-agent /etc/init.d/hms-agent
+ ln -sf ${PREFIX}/sbin/ambari-agent /etc/init.d/ambari-agent
- ln -sf ${CONF_DIR}/hms-agent-env.sh /etc/default/hms-agent-env.sh
+ ln -sf ${CONF_DIR}/ambari-agent-env.sh /etc/default/ambari-agent-env.sh
mkdir -p ${PID_DIR}
mkdir -p ${LOG_DIR}
TFILE="/tmp/$(basename $0).$$.tmp"
- grep -v "^export HMS_HOME" ${CONF_DIR}/hms-agent-env.sh | \
- grep -v "^export HMS_CONF_DIR" | \
- grep -v "^export HMS_CLASSPATH" | \
- grep -v "^export HMS_PID_DIR" | \
- grep -v "^export HMS_LOG_DIR" | \
+ grep -v "^export AMBARI_HOME" ${CONF_DIR}/ambari-agent-env.sh | \
+ grep -v "^export AMBARI_CONF_DIR" | \
+ grep -v "^export AMBARI_CLASSPATH" | \
+ grep -v "^export AMBARI_PID_DIR" | \
+ grep -v "^export AMBARI_LOG_DIR" | \
grep -v "^export JAVA_HOME" > ${TFILE}
if [ -z "${JAVA_HOME}" ]; then
if [ -e /etc/lsb-release ]; then
@@ -162,12 +162,12 @@ else
if [ "${JAVA_HOME}xxx" != "xxx" ]; then
echo "export JAVA_HOME=${JAVA_HOME}" >> ${TFILE}
fi
- echo "export HMS_IDENT_STRING=\`whoami\`" >> ${TFILE}
- echo "export HMS_HOME=${PREFIX}/share/hms" >> ${TFILE}
- echo "export HMS_CONF_DIR=${CONF_DIR}" >> ${TFILE}
- echo "export HMS_CLASSPATH=${CONF_DIR}:${HADOOP_CONF_DIR}:${HADOOP_JARS}:${ZOOKEEPER_JARS}" >> ${TFILE}
- echo "export HMS_PID_DIR=${PID_DIR}" >> ${TFILE}
- echo "export HMS_LOG_DIR=${LOG_DIR}" >> ${TFILE}
- cp ${TFILE} ${CONF_DIR}/hms-agent-env.sh
+ echo "export AMBARI_IDENT_STRING=\`whoami\`" >> ${TFILE}
+ echo "export AMBARI_HOME=${PREFIX}/share/ambari" >> ${TFILE}
+ echo "export AMBARI_CONF_DIR=${CONF_DIR}" >> ${TFILE}
+ echo "export AMBARI_CLASSPATH=${CONF_DIR}:${HADOOP_CONF_DIR}:${HADOOP_JARS}:${ZOOKEEPER_JARS}" >> ${TFILE}
+ echo "export AMBARI_PID_DIR=${PID_DIR}" >> ${TFILE}
+ echo "export AMBARI_LOG_DIR=${LOG_DIR}" >> ${TFILE}
+ cp ${TFILE} ${CONF_DIR}/ambari-agent-env.sh
rm -f ${TFILE}
fi