Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7791E9855 for ; Tue, 3 Jan 2012 17:28:48 +0000 (UTC) Received: (qmail 18111 invoked by uid 500); 3 Jan 2012 17:28:48 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 18070 invoked by uid 500); 3 Jan 2012 17:28:48 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 18063 invoked by uid 99); 3 Jan 2012 17:28:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2012 17:28:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jan 2012 17:28:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 532FE23888FE; Tue, 3 Jan 2012 17:28:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Tue, 03 Jan 2012 17:28:19 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120103172821.532FE23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ -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