You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/01/03 18:28:19 UTC
svn commit: r1226886 [1/3] - in /incubator/bigtop/trunk: ./
bigtop-deploy/puppet/modules/hadoop-hbase/manifests/
bigtop-packages/src/deb/hbase/ bigtop-packages/src/rpm/hbase/SOURCES/
bigtop-packages/src/rpm/hbase/SPECS/ bigtop-tests/test-artifacts/pack...
Author: rvs
Date: Tue Jan 3 17:28:18 2012
New Revision: 1226886
URL: http://svn.apache.org/viewvc?rev=1226886&view=rev
Log:
BIGTOP-327. rename hadoop-hbase package into hbase
Added:
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop.postinst
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.install
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.dirs
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.install
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.install
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.manpages
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.preinst
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse
- copied, changed from r1226885, incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse
Removed:
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase-doc.install
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.install
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postinst.tpl
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postrm.tpl
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_apt.xml
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_urpmi.xml
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data_zypper.xml
incubator/bigtop/trunk/bigtop.mk
Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp Tue Jan 3 17:28:18 2012
@@ -15,7 +15,7 @@
class hadoop-hbase {
class client-package {
- package { "hadoop-hbase":
+ package { "hbase":
ensure => latest,
}
}
@@ -25,11 +25,11 @@ class hadoop-hbase {
file { "/etc/hbase/conf/hbase-site.xml":
content => template("hadoop-hbase/hbase-site.xml"),
- require => Package["hadoop-hbase"],
+ require => Package["hbase"],
}
file { "/etc/hbase/conf/hbase-env.sh":
content => template("hadoop-hbase/hbase-env.sh"),
- require => Package["hadoop-hbase"],
+ require => Package["hbase"],
}
}
@@ -40,13 +40,13 @@ class hadoop-hbase {
define server($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
include common-server-config
- package { "hadoop-hbase-regionserver":
+ package { "hbase-regionserver":
ensure => latest,
}
- service { "hadoop-hbase-regionserver":
+ service { "hbase-regionserver":
ensure => running,
- require => Package["hadoop-hbase-regionserver"],
+ require => Package["hbase-regionserver"],
subscribe => File["/etc/hbase/conf/hbase-site.xml", "/etc/hbase/conf/hbase-env.sh"],
hasrestart => true,
hasstatus => true,
@@ -56,13 +56,13 @@ class hadoop-hbase {
define master($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
include common-server-config
- package { "hadoop-hbase-master":
+ package { "hbase-master":
ensure => latest,
}
- service { "hadoop-hbase-master":
+ service { "hbase-master":
ensure => running,
- require => Package["hadoop-hbase-master"],
+ require => Package["hbase-master"],
subscribe => File["/etc/hbase/conf/hbase-site.xml", "/etc/hbase/conf/hbase-env.sh"],
hasrestart => true,
hasstatus => true,
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control Tue Jan 3 17:28:18 2012
@@ -12,7 +12,7 @@
# 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.
-Source: hadoop-hbase
+Source: hbase
Section: misc
Priority: extra
Maintainer: Bigtop <bi...@incubator.apache.org>
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 6), git-cor
Standards-Version: 3.8.0
Homepage: http://hbase.apache.org/
-Package: hadoop-hbase
+Package: hbase
Architecture: all
Depends: adduser, zookeeper (>= 3.3.1), hadoop, bigtop-utils
Recommends: ntp
@@ -29,28 +29,28 @@ Description: HBase is the Hadoop databas
This project's goal is the hosting of very large tables -- billions of rows
X millions of columns -- atop clusters of commodity hardware.
-Package: hadoop-hbase-doc
+Package: hbase-doc
Architecture: all
Section: doc
Description: Documentation for HBase
This package contains the HBase manual and JavaDoc.
-Package: hadoop-hbase-master
+Package: hbase-master
Architecture: all
-Depends: hadoop-hbase (= ${source:Version})
+Depends: hbase (= ${source:Version})
Description: HMaster is the "master server" for a HBase
There is only one HMaster for a single HBase deployment.
-Package: hadoop-hbase-regionserver
+Package: hbase-regionserver
Architecture: all
-Depends: hadoop-hbase (= ${source:Version})
+Depends: hbase (= ${source:Version})
Description: HRegionServer makes a set of HRegions available to clients
It checks in with the HMaster. There are many HRegionServers in a single
HBase deployment.
-Package: hadoop-hbase-thrift
+Package: hbase-thrift
Architecture: all
-Depends: hadoop-hbase (= ${source:Version})
+Depends: hbase (= ${source:Version})
Description: Provides an HBase Thrift service
This package provides a Thrift service interface to the HBase distributed
database.
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop.postinst (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop.postinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop.postinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.postinst&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.dirs
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.dirs?rev=1226886&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.dirs (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.dirs Tue Jan 3 17:28:18 2012
@@ -0,0 +1 @@
+/usr/share/doc/hbase-doc/
Added: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.install
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.install?rev=1226886&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.install (added)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase-doc.install Tue Jan 3 17:28:18 2012
@@ -0,0 +1 @@
+/usr/share/doc/hbase-doc
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.dirs (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.dirs?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.dirs&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.dirs&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.install (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.install)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.install?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.install&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.install&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.manpages (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.manpages?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.manpages&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.manpages&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Copied: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.preinst (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.preinst?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hbase.preinst&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/hadoop-hbase.preinst&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh Tue Jan 3 17:28:18 2012
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SRC_PKG=hadoop-hbase
+SRC_PKG=hbase
for node in master regionserver thrift ; do
service_pkgdir=debian/$SRC_PKG-$node
debdir=$service_pkgdir/DEBIAN
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Tue Jan 3 17:28:18 2012
@@ -23,6 +23,11 @@ export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
+hadoop_home=/usr/lib/hadoop
+zookeeper_home=/usr/lib/zookeeper
+hbase_pkg_name=hbase
+hbase_jar_deps=${hadoop_home}/hadoop-core.jar ${zookeeper_home}/zookeeper.jar
+
patch: patch-stamp
patch-stamp:
touch $@
@@ -44,28 +49,25 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- cp debian/hbase.default debian/hadoop-hbase/etc/default/hbase
+ cp debian/hbase.default debian/${hbase_pkg_name}/etc/default/${hbase_pkg_name}
sh -x debian/install_hbase.sh \
--build-dir=. \
- --doc-dir=usr/share/doc/hadoop-hbase-doc \
+ --doc-dir=usr/share/doc/${hbase_pkg_name}-doc \
--prefix=debian/tmp
mkdir -p debian/tmp/etc/security/limits.d
- cp debian/hbase.nofiles.conf debian/tmp/etc/security/limits.d
+ cp debian/hbase.nofiles.conf debian/tmp/etc/security/limits.d/${hbase_pkg_name}.nofiles.conf
# Symlink in the dependency jars from their packages. Both of these packages
# provide an unversioned symlink foo.jar -> foo-0.1.2.jar.
- rm debian/tmp/usr/lib/hbase/lib/zookeeper-*.jar
- rm debian/tmp/usr/lib/hbase/lib/hadoop-*.jar
- ln -s /usr/lib/zookeeper/zookeeper.jar debian/tmp/usr/lib/hbase/lib/zookeeper.jar
- ln -s /usr/lib/hadoop/hadoop-core.jar debian/tmp/usr/lib/hbase/lib/hadoop-core.jar
- ln -s /var/log/hbase debian/tmp/usr/lib/hbase/logs
- ln -s /var/run/hbase debian/tmp/usr/lib/hbase/pids
+ ln -f -s ${hbase_jar_deps} debian/tmp/usr/lib/${hbase_pkg_name}/lib/
+ ln -s /var/log/${hbase_pkg_name} debian/tmp/usr/lib/${hbase_pkg_name}/logs
+ ln -s /var/run/${hbase_pkg_name} debian/tmp/usr/lib/${hbase_pkg_name}/pids
# Wage war on "executable-not-elf-or-script" warnings:
### ruby scripts should not be executable - they require
### hbase org.jruby.Main <script>
- find debian/tmp/usr/lib/hbase/bin debian/tmp/usr/lib/hbase/lib -name \*.rb -exec chmod 644 {} \;
+ find debian/tmp/usr/lib/${hbase_pkg_name}/bin debian/tmp/usr/lib/${hbase_pkg_name}/lib -name \*.rb -exec chmod 644 {} \;
### webapps should not be executable either
- find debian/tmp/usr/lib/hbase/hbase-webapps -type f -exec chmod 644 {} \;
+ find debian/tmp/usr/lib/${hbase_pkg_name}/hbase-webapps -type f -exec chmod 644 {} \;
(dh_lintian) || /bin/true
@@ -89,7 +91,7 @@ binary-common:
dh_installinit --onlyscripts
# dh_installinit has a bug whereby it makes preinst/postinst files
# even for subpackages that don't have an init script!
- rm -f debian/hadoop-hbase-doc*debhelper debian/hadoop-hbase.*debhelper || :
+ rm -f debian/${hbase_pkg_name}-doc*debhelper debian/${hbase_pkg_name}.*debhelper || :
dh_installdeb
dh_shlibdeps
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl Tue Jan 3 17:28:18 2012
@@ -49,8 +49,8 @@ export HBASE_HOME=/usr/lib/hbase
export HBASE_PID_DIR=/var/run/hbase
# Include HBase defaults if available
-if [ -f /etc/default/hadoop-hbase ] ; then
- . /etc/default/hadoop-hbase
+if [ -f /etc/default/hbase ] ; then
+ . /etc/default/hbase
fi
if [ -f /usr/lib/hbase/bin/hbase-config.sh ] ; then
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postinst.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postinst.tpl?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postinst.tpl (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postinst.tpl Tue Jan 3 17:28:18 2012
@@ -36,7 +36,7 @@ set -e
case "$1" in
configure)
- update-rc.d hadoop-hbase-@HBASE_DAEMON@ defaults >/dev/null || exit 1
+ update-rc.d hbase-@HBASE_DAEMON@ defaults >/dev/null || exit 1
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postrm.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postrm.tpl?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postrm.tpl (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-postrm.tpl Tue Jan 3 17:28:18 2012
@@ -37,7 +37,7 @@ set -e
case "$1" in
purge)
- update-rc.d -f hadoop-hbase-@HBASE_DAEMON@ remove > /dev/null || exit 1
+ update-rc.d -f hbase-@HBASE_DAEMON@ remove > /dev/null || exit 1
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
Copied: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh?p2=incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh&p1=incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Copied: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse (from r1226885, incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse)
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse?p2=incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse&p1=incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse&r1=1226885&r2=1226886&rev=1226886&view=diff
==============================================================================
(empty)
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Tue Jan 3 17:28:18 2012
@@ -12,8 +12,8 @@
# 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.
-%define etc_hbase /etc/hbase
-%define hbase_home /usr/lib/hbase
+%define etc_hbase /etc/%{name}
+%define hbase_home /usr/lib/%{name}
%define bin_hbase %{hbase_home}/bin
%define lib_hbase %{hbase_home}/lib
%define conf_hbase %{hbase_home}/conf
@@ -23,6 +23,9 @@
%define man_dir %{_mandir}
%define hbase_username hbase
%define hbase_services master regionserver thrift
+%define hadoop_home /usr/lib/hadoop
+%define zookeeper_home /usr/lib/zookeeper
+%define hbase_jar_deps %{hadoop_home}/hadoop-core.jar %{zookeeper_home}/zookeeper.jar
%if %{?suse_version:1}0
@@ -41,30 +44,30 @@
/usr/lib/rpm/brp-compress ; \
%{nil}
-%define doc_hbase %{_docdir}/hbase
+%define doc_hbase %{_docdir}/%{name}
%global initd_dir %{_sysconfdir}/rc.d
%else
-%define doc_hbase %{_docdir}/hbase-%{hbase_version}
+%define doc_hbase %{_docdir}/%{name}-%{hbase_version}
%global initd_dir %{_sysconfdir}/rc.d/init.d
%endif
-Name: hadoop-hbase
+Name: hbase
Version: %{hbase_version}
Release: %{hbase_release}
Summary: HBase is the Hadoop database. Use it when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware.
-URL: http://hadoop.apache.org/hbase/
+URL: http://hbase.apache.org/
Group: Development/Libraries
Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
License: APL2
-Source0: hbase-%{hbase_base_version}.tar.gz
+Source0: %{name}-%{hbase_base_version}.tar.gz
Source1: do-component-build
Source2: install_hbase.sh
-Source3: hadoop-hbase.sh
-Source4: hadoop-hbase.sh.suse
+Source3: hbase.sh
+Source4: hbase.sh.suse
Source5: hbase.default
Source6: hbase.nofiles.conf
BuildArch: noarch
@@ -93,7 +96,7 @@ HBase is an open-source, distributed, co
%package master
Summary: The Hadoop HBase master Server.
Group: System/Daemons
-Provides: hbase-master
+Provides: %{name}-master
Requires: %{name} = %{version}-%{release}
%if %{?suse_version:1}0
@@ -119,7 +122,7 @@ HMaster is the "master server" for a HBa
%package regionserver
Summary: The Hadoop HBase RegionServer server.
Group: System/Daemons
-Provides: hbase-regionserver
+Provides: %{name}-regionserver
Requires: %{name} = %{version}-%{release}
%if %{?suse_version:1}0
@@ -146,7 +149,7 @@ HRegionServer makes a set of HRegions av
%package thrift
Summary: The Hadoop HBase Thrift Interface
Group: System/Daemons
-Provides: hbase-thrift
+Provides: %{name}-thrift
Requires: %{name} = %{version}-%{release}
%if %{?suse_version:1}0
@@ -182,7 +185,7 @@ Documentation for Hbase
%prep
-%setup -n hbase-%{hbase_base_version}
+%setup -n %{name}-%{hbase_base_version}
%build
env HBASE_VERSION=%{version} bash %{SOURCE1}
@@ -197,21 +200,21 @@ sh %{SOURCE2} \
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default/
-%__install -m 0644 $RPM_SOURCE_DIR/hbase.default $RPM_BUILD_ROOT/etc/default/hbase
+%__install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/etc/default/%{name}
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
-%__install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/limits.d/hbase.nofiles.conf
+%__install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/limits.d/%{name}.nofiles.conf
-%__install -d -m 0755 %{buildroot}/%{_localstatedir}/log/hbase
-ln -s %{_localstatedir}/log/hbase %{buildroot}/%{logs_hbase}
+%__install -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}
+ln -s %{_localstatedir}/log/%{name} %{buildroot}/%{logs_hbase}
-%__install -d -m 0755 %{buildroot}/%{_localstatedir}/run/hbase
-ln -s %{_localstatedir}/run/hbase %{buildroot}/%{pids_hbase}
+%__install -d -m 0755 %{buildroot}/%{_localstatedir}/run/%{name}
+ln -s %{_localstatedir}/run/%{name} %{buildroot}/%{pids_hbase}
%if %{?suse_version:1}0
-orig_init_file=$RPM_SOURCE_DIR/hadoop-hbase.sh.suse
+orig_init_file=%{SOURCE4}
%else
-orig_init_file=$RPM_SOURCE_DIR/hadoop-hbase.sh
+orig_init_file=%{SOURCE3}
%endif
for service in %{hbase_services}
@@ -225,10 +228,7 @@ done
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
# Pull zookeeper and hadoop from their packages
-rm -f $RPM_BUILD_ROOT/usr/lib/hbase/lib/hadoop* \
- $RPM_BUILD_ROOT/usr/lib/hbase/lib/zookeeper*
-ln -s /usr/lib/hadoop/hadoop-core.jar $RPM_BUILD_ROOT/usr/lib/hbase/lib/hadoop-core.jar
-ln -s /usr/lib/zookeeper/zookeeper.jar $RPM_BUILD_ROOT/usr/lib/hbase/lib/zookeeper.jar
+ln -f -s %{hbase_jar_deps} $RPM_BUILD_ROOT/%{lib_hbase}
%pre
getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase
Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy?rev=1226886&r1=1226885&r2=1226886&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy (original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy Tue Jan 3 17:28:18 2012
@@ -41,7 +41,7 @@ class CDHServices {
verifier : new StateVerifierHive(),
],
HBase : [ services : [ "hadoop-namenode", "hadoop-datanode",
- "hadoop-hbase-master" ],
+ "hbase-master" ],
killIDs : [ "hdfs", "hbase" ],
verifier : new StateVerifierHBase(),
],