Repository: bigtop Updated Branches: refs/heads/master fe2c42944 -> 73eccc481
BIGTOP-2077. Bump HBase version to 1.1 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/73eccc48 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/73eccc48 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/73eccc48 Branch: refs/heads/master Commit: 73eccc48178dfc97f9b68004ca2c57d6cbc263e0 Parents: fe2c429 Author: Youngwoo Kim <[email protected]> Authored: Thu Feb 11 20:03:17 2016 +0900 Committer: YoungWoo Kim <[email protected]> Committed: Mon May 2 01:29:37 2016 +0000 ---------------------------------------------------------------------- .../modules/hadoop_hbase/templates/hbase-env.sh | 72 ++++++++++++++++++-- .../src/common/crunch/do-component-build | 2 +- .../src/common/flume/do-component-build | 4 +- .../src/common/hbase/do-component-build | 13 +--- .../src/common/hbase/install_hbase.sh | 5 ++ .../src/common/hive/do-component-build | 4 +- .../src/common/kite/do-component-build | 2 +- .../src/common/mahout/do-component-build | 2 +- .../src/common/phoenix/do-component-build | 20 ++++-- .../src/common/phoenix/install_phoenix.sh | 7 +- .../src/common/pig/do-component-build | 2 +- .../src/common/ycsb/do-component-build | 2 +- bigtop-packages/src/deb/hbase/control | 2 +- bigtop-packages/src/deb/hbase/rules | 14 ++++ bigtop-packages/src/deb/phoenix/rules | 17 ----- bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 16 ++++- .../src/rpm/phoenix/SPECS/phoenix.spec | 20 ------ bigtop.bom | 6 +- pom.xml | 2 +- 19 files changed, 133 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-deploy/puppet/modules/hadoop_hbase/templates/hbase-env.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop_hbase/templates/hbase-env.sh b/bigtop-deploy/puppet/modules/hadoop_hbase/templates/hbase-env.sh index 2f96581..a2dc9af 100644 --- a/bigtop-deploy/puppet/modules/hadoop_hbase/templates/hbase-env.sh +++ b/bigtop-deploy/puppet/modules/hadoop_hbase/templates/hbase-env.sh @@ -1,7 +1,5 @@ # #/** -# * Copyright 2007 The Apache Software Foundation -# * # * Licensed to the Apache Software Foundation (ASF) under one # * or more contributor license agreements. See the NOTICE file # * distributed with this work for additional information @@ -21,15 +19,24 @@ # Set environment variables here. -# The java implementation to use. Java 1.6 required. +# This script sets variables multiple times over the course of starting an hbase process, +# so try to keep things idempotent unless you want to take an even deeper look +# into the startup scripts (bin/hbase, etc.) + +# The java implementation to use. Java 1.7+ required. # export JAVA_HOME=/usr/java/jdk1.6.0/ # Extra Java CLASSPATH elements. Optional. export HBASE_CLASSPATH=/etc/hadoop/conf -# The maximum amount of heap to use, in MB. Default is 1000. +# The maximum amount of heap to use. Default is left to JVM default. +# export HBASE_HEAPSIZE=1G export HBASE_HEAPSIZE=<%= @heap_size %> +# Uncomment below if you intend to use off heap cache. For example, to allocate 8G of +# offheap, set the value to "8G". +# export HBASE_OFFHEAPSIZE=1G + # Extra Java runtime options. # Below are what we set by default. May only work with SUN JVM. # For more on why as well as other possible settings, @@ -42,28 +49,70 @@ export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Djava.security.auth.login.config=/ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf" <% end -%> -# Uncomment below to enable java garbage collection logging. -# export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log" +# Uncomment one of the below three options to enable java garbage collection logging for the server-side processes. + +# This enables basic gc logging to the .out file. +# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps" + +# This enables basic gc logging to its own file. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>" + +# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M" + +# Uncomment one of the below three options to enable java garbage collection logging for the client processes. + +# This enables basic gc logging to the .out file. +# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps" + +# This enables basic gc logging to its own file. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>" + +# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+. +# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR . +# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M" + +# See the package documentation for org.apache.hadoop.hbase.io.hfile for other configurations +# needed setting up off-heap block caching. # Uncomment and adjust to enable JMX exporting # See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access. # More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html -# +# NOTE: HBase provides an alternative JMX implementation to fix the random ports issue, please see JMX +# section in HBase Reference Guide for instructions. + # export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" # export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10101" # export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10102" # export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103" # export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104" +# export HBASE_REST_OPTS="$HBASE_REST_OPTS $HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10105" # File naming hosts on which HRegionServers will run. $HBASE_HOME/conf/regionservers by default. # export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers +# Uncomment and adjust to keep all the Region Server pages mapped to be memory resident +#HBASE_REGIONSERVER_MLOCK=true +#HBASE_REGIONSERVER_UID="hbase" + +# File naming hosts on which backup HMaster will run. $HBASE_HOME/conf/backup-masters by default. +# export HBASE_BACKUP_MASTERS=${HBASE_HOME}/conf/backup-masters + # Extra ssh options. Empty by default. # export HBASE_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR" # Where log files are stored. $HBASE_HOME/logs by default. # export HBASE_LOG_DIR=${HBASE_HOME}/logs +# Enable remote JDWP debugging of major HBase processes. Meant for Core Developers +# export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8070" +# export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8071" +# export HBASE_THRIFT_OPTS="$HBASE_THRIFT_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8072" +# export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8073" + # A string representing this instance of hbase. $USER by default. # export HBASE_IDENT_STRING=$USER @@ -80,3 +129,12 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth.lo # Tell HBase whether it should manage it's own instance of Zookeeper or not. # export HBASE_MANAGES_ZK=true + +# The default log rolling policy is RFA, where the log file is rolled as per the size defined for the +# RFA appender. Please refer to the log4j.properties file to see more details on this appender. +# In case one needs to do log rolling on a date change, one should set the environment property +# HBASE_ROOT_LOGGER to "<DESIRED_LOG LEVEL>,DRFA". +# For example: +# HBASE_ROOT_LOGGER=INFO,DRFA +# The reason for changing default to RFA is to avoid the boundary case of filling out disk space as +# DRFA doesn't put any cap on the log size. Please refer to HBase-5655 for more context. http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/crunch/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/crunch/do-component-build b/bigtop-packages/src/common/crunch/do-component-build index 6145f16..8ce59e3 100644 --- a/bigtop-packages/src/common/crunch/do-component-build +++ b/bigtop-packages/src/common/crunch/do-component-build @@ -22,7 +22,7 @@ export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" mvn -DskipTests -Dcrunch.platform=2 \ -Dhadoop.version=$HADOOP_VERSION \ - -Dhbase.version=$HBASE_VERSION-hadoop2 \ + -Dhbase.version=$HBASE_VERSION \ -Dspark.version=$SPARK_VERSION \ -Papache-release clean site:site package "$@" http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/flume/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/flume/do-component-build b/bigtop-packages/src/common/flume/do-component-build index 98f22e9..10a97e3 100755 --- a/bigtop-packages/src/common/flume/do-component-build +++ b/bigtop-packages/src/common/flume/do-component-build @@ -27,9 +27,9 @@ sed -i -e \ # The following is weird, but true: yes *hadoop*.profile is hbase-98 # This profile will activate hadoop2.version as the relevant property # and will also make us specify hbase version with -hadoop2 prefix -mvn -DskipTests -Dhadoop.profile=hbase-98 \ +mvn -DskipTests \ -Dhadoop2.version=$HADOOP_VERSION \ - -Dhbase.version=${HBASE_VERSION}-hadoop2 \ + -Dhbase.version=${HBASE_VERSION} \ -Dkite.version=${KITE_VERSION} \ -Dhive.version=${HIVE_VERSION} \ clean install "$@" http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/hbase/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build index a602998..c9c12a4 100644 --- a/bigtop-packages/src/common/hbase/do-component-build +++ b/bigtop-packages/src/common/hbase/do-component-build @@ -18,22 +18,13 @@ set -ex . `dirname $0`/bigtop.bom -#A hack to disable Codehaus repository since it's out of service -sed --in-place -e '/http:\/\/repository.codehaus.org/,/<\/repository>/s/true/false/' pom.xml - export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" -#An awful hack for BIGTOP-1429 to satisfy ASF CI build deps. resolution -bash -x ./dev-support/generate-hadoopX-poms.sh $HBASE_VERSION $HBASE_VERSION-hadoop2 - -mvn -DskipTests -Dslf4j.version=1.6.1 \ - -Dhadoop-two.version=$HADOOP_VERSION \ - -Dzookeeper.version=$ZOOKEEPER_VERSION \ - clean install -f pom.xml.hadoop2 "$@" && \ mvn -DskipTests -Dslf4j.version=1.6.1 \ -Dhadoop-two.version=$HADOOP_VERSION \ -Dzookeeper.version=$ZOOKEEPER_VERSION \ - install site assembly:single -f pom.xml.hadoop2 "$@" + -Dcheckstyle.skip=true \ + clean site install assembly:single "$@" rm -rf build mkdir build tar -C build --strip-components=1 -xzf hbase-assembly/target/hbase*.tar.gz http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/hbase/install_hbase.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hbase/install_hbase.sh b/bigtop-packages/src/common/hbase/install_hbase.sh index 469d498..3a05ee7 100755 --- a/bigtop-packages/src/common/hbase/install_hbase.sh +++ b/bigtop-packages/src/common/hbase/install_hbase.sh @@ -99,6 +99,7 @@ done MAN_DIR=${MAN_DIR:-/usr/share/man/man1} DOC_DIR=${DOC_DIR:-/usr/share/doc/hbase} LIB_DIR=${LIB_DIR:-/usr/lib/hbase} + BIN_DIR=${BIN_DIR:-/usr/lib/hbase/bin} ETC_DIR=${ETC_DIR:-/etc/hbase} CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist} @@ -161,3 +162,7 @@ EOF chmod 755 $wrapper install -d -m 0755 $PREFIX/usr/bin + +rm -f $PREFIX/$CONF_DIR/*.cmd +rm -f $PREFIX/$BIN_DIR/*.cmd + http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/hive/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hive/do-component-build b/bigtop-packages/src/common/hive/do-component-build index 38ba6d9..01b8038 100644 --- a/bigtop-packages/src/common/hive/do-component-build +++ b/bigtop-packages/src/common/hive/do-component-build @@ -23,10 +23,10 @@ HIVE_MAVEN_OPTS=" -Dhbase.version=$HBASE_VERSION \ -Dhadoop.mr.rev=23 \ -Dhadoop.security.version=$HADOOP_VERSION \ -Dhadoop-23.version=$HADOOP_VERSION \ --Dhbase.hadoop2.version=$HBASE_VERSION-hadoop2 \ +-Dhbase.hadoop2.version=$HBASE_VERSION \ -Dmvn.hadoop.profile=hadoop23 \ -DskipTests \ --Dhbase.version.with.hadoop.version=$HBASE_VERSION-hadoop2 \ +-Dhbase.version.with.hadoop.version=$HBASE_VERSION \ -Dtez.version=${TEZ_VERSION} \ -Dspark.version=${SPARK_VERSION} " http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/kite/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/kite/do-component-build b/bigtop-packages/src/common/kite/do-component-build index e747d14..e62df4c 100644 --- a/bigtop-packages/src/common/kite/do-component-build +++ b/bigtop-packages/src/common/kite/do-component-build @@ -21,7 +21,7 @@ set -ex mvn clean install \ -DjavaVersion=${JDK_VERSION} \ -Dvers.hadoop2=${HADOOP_VERSION} \ - -Dvers.hbase2=${HBASE_VERSION}-hadoop2 \ + -Dvers.hbase2=${HBASE_VERSION} \ -Dvers.flume=${FLUME_VERSION} \ -Dvers.spark=${SPARK_VERSION} \ -Dvers.crunch=${CRUNCH_VERSION} \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/mahout/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/mahout/do-component-build b/bigtop-packages/src/common/mahout/do-component-build index fd1e33f..0593f71 100644 --- a/bigtop-packages/src/common/mahout/do-component-build +++ b/bigtop-packages/src/common/mahout/do-component-build @@ -21,7 +21,7 @@ set -ex mvn clean install -DskipTests -Dmahout.skip.distribution=false \ -Phadoop2 \ -Dhadoop.version=$HADOOP_VERSION \ - -Dhbase.version=$HBASE_VERSION-hadoop2 \ + -Dhbase.version=$HBASE_VERSION \ -Dspark.version=${SPARK_VERSION} \ "$@" http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/phoenix/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/phoenix/do-component-build b/bigtop-packages/src/common/phoenix/do-component-build index 1f71864..8471639 100644 --- a/bigtop-packages/src/common/phoenix/do-component-build +++ b/bigtop-packages/src/common/phoenix/do-component-build @@ -19,14 +19,26 @@ set -ex . `dirname $0`/bigtop.bom mvn -DskipTests \ + -Dhadoop.version=$HADOOP_VERSION \ -Dhadoop-two.version=$HADOOP_VERSION \ - -Dhbase.version=$HBASE_VERSION-hadoop2 \ + -Dhbase.version=$HBASE_VERSION \ -Dpig.version=$PIG_VERSION \ -Dflume.version=$FLUME_VERSION \ -Dspark.version=${SPARK_VERSION} \ clean install "$@" rm -rf build mkdir build -tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION.tar.gz -cp -ra dev/release_files/* build/ -cp -ra phoenix-pherf/config build/bin/ + +# Make binary tar +rm -rf $(find . -type d -name archive-tmp); + +phoenix_jars=$(find -iname phoenix-*.jar) +cp $phoenix_jars build/; + +cp -R bin build/; + +cp -R phoenix-pherf/config build/bin/ + +cp -R examples build/ + +cp dev/release_files/* build/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/phoenix/install_phoenix.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/phoenix/install_phoenix.sh b/bigtop-packages/src/common/phoenix/install_phoenix.sh index b1b25b7..aa91b00 100755 --- a/bigtop-packages/src/common/phoenix/install_phoenix.sh +++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh @@ -113,11 +113,8 @@ install -d -m 0755 $PREFIX/$CONF_DIR install -d -m 0755 $PREFIX/var/lib/phoenix install -d -m 0755 $PREFIX/var/log/phoenix -cp -ra $BUILD_DIR/{bin,lib} $PREFIX/$LIB_DIR/ -rm $PREFIX/$LIB_DIR/lib/phoenix-*.jar -cp -a $BUILD_DIR/*.jar $PREFIX/$LIB_DIR/ -cp -a $BUILD_DIR/lib/phoenix-*.jar $PREFIX/$LIB_DIR/ - +cp $BUILD_DIR/*.jar $PREFIX/$LIB_DIR/ +cp -r $BUILD_DIR/bin $PREFIX/$LIB_DIR/ chmod 755 $PREFIX/$BIN_DIR/*.py chmod 755 $PREFIX/$BIN_DIR/*.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/pig/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/pig/do-component-build b/bigtop-packages/src/common/pig/do-component-build index 5c210a3..671c5d4 100644 --- a/bigtop-packages/src/common/pig/do-component-build +++ b/bigtop-packages/src/common/pig/do-component-build @@ -20,7 +20,7 @@ set -ex cat <<__EOT__ >> ivy/libraries.properties -hbase95.version=$HBASE_VERSION-hadoop2 +hbase95.version=$HBASE_VERSION hive.version=$HIVE_VERSION zookeeper.version=$ZOOKEEPER_VERSION hadoop-common.version=$HADOOP_VERSION http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/common/ycsb/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/ycsb/do-component-build b/bigtop-packages/src/common/ycsb/do-component-build index ab1b107..dafb220 100644 --- a/bigtop-packages/src/common/ycsb/do-component-build +++ b/bigtop-packages/src/common/ycsb/do-component-build @@ -18,7 +18,7 @@ set -ex . `dirname $0`/bigtop.bom -mvn clean package -DskipTests -Dhbase098.version=$HBASE_VERSION-hadoop2 "$@" +mvn clean package -DskipTests -Dhbase10.version=$HBASE_VERSION "$@" rm -rf build/dist mkdir -p build/dist http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/deb/hbase/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hbase/control b/bigtop-packages/src/deb/hbase/control index bfa4218..ff53689 100644 --- a/bigtop-packages/src/deb/hbase/control +++ b/bigtop-packages/src/deb/hbase/control @@ -22,7 +22,7 @@ Homepage: http://hbase.apache.org/ Package: hbase Architecture: all -Depends: adduser, zookeeper (>= 3.3.1), hadoop-hdfs, bigtop-utils (>= 0.7) +Depends: adduser, zookeeper (>= 3.3.1), hadoop-client, bigtop-utils (>= 0.7) # Any system that can prevent clock skew is recommended, but if it conflicts with one of these, apt-get will remove it by default Recommends: ntp | chrony Description: 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. http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/deb/hbase/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hbase/rules b/bigtop-packages/src/deb/hbase/rules index 9c8f68a..b60bd12 100755 --- a/bigtop-packages/src/deb/hbase/rules +++ b/bigtop-packages/src/deb/hbase/rules @@ -25,6 +25,7 @@ export DH_VERBOSE=1 export DH_OPTIONS zookeeper_home=/usr/lib/zookeeper +hadoop_home=/usr/lib/hadoop hbase_pkg_name=hbase %: @@ -47,6 +48,19 @@ override_dh_auto_install: # provide an unversioned symlink foo.jar -> foo-0.1.2.jar. rm -f debian/tmp/usr/lib/${hbase_pkg_name}/lib/{hadoop,zookeeper,slf4j-log4j12-}*.jar ln -f -s ${zookeeper_home}/zookeeper.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-annotations.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-auth.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-common.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-hdfs.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-app.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-common.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-core.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-jobclient.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-mapreduce-client-shuffle.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-yarn-api.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-yarn-client.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-yarn-common.jar debian/tmp/usr/lib/${hbase_pkg_name}/lib/ + ln -f -s ${hadoop_home}/client/hadoop-yarn-server-common.jar 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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/deb/phoenix/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/phoenix/rules b/bigtop-packages/src/deb/phoenix/rules index d80e547..7be0a19 100755 --- a/bigtop-packages/src/deb/phoenix/rules +++ b/bigtop-packages/src/deb/phoenix/rules @@ -49,20 +49,3 @@ override_dh_auto_install: queryserver --build-dir=$${PWD}/build \ --prefix=debian/tmp - # Symlink in the dependency jars from their packages. - rm -f debian/tmp/usr/lib/${phoenix_pkg_name}/lib/zookeeper*.jar - ln -f -s ${zookeeper_home}/zookeeper.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - rm -f debian/tmp/usr/lib/${phoenix_pkg_name}/lib/hadoop*.jar - ln -f -s ${hadoop_home}/hadoop-annotations.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hadoop_home}/hadoop-auth.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hadoop_home}/hadoop-common.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hadoop_mapreduce_home}/hadoop-mapreduce-client-core.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hadoop_yarn_home}/hadoop-yarn-api.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hadoop_yarn_home}/hadoop-yarn-common.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hadoop_hdfs_home}/hadoop-hdfs.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - rm -f debian/tmp/usr/lib/${phoenix_pkg_name}/lib/hbase*.jar - ln -f -s ${hbase_home}/hbase-testing-util.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hbase_home}/hbase-it.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hbase_home}/hbase-common.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hbase_home}/hbase-protocol.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ - ln -f -s ${hbase_home}/hbase-client.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec index 43f4a64..d59a404 100644 --- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec +++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec @@ -93,7 +93,7 @@ Source6: hbase.nofiles.conf Source7: regionserver-init.d.tpl BuildArch: noarch Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service -Requires: hadoop-hdfs, zookeeper >= 3.3.1, bigtop-utils >= 0.7 +Requires: hadoop-client, zookeeper >= 3.3.1, bigtop-utils >= 0.7 %if 0%{?mgaversion} Requires: bsh-utils @@ -314,6 +314,20 @@ done rm -f $RPM_BUILD_ROOT/%{lib_hbase}/{hadoop,zookeeper,slf4j-log4j12-}*.jar ln -f -s %{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-annotations.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-auth.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-common.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-hdfs.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-mapreduce-client-app.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-mapreduce-client-common.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-mapreduce-client-jobclient.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-mapreduce-client-shuffle.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-yarn-api.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-yarn-client.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-yarn-common.jar $RPM_BUILD_ROOT/%{lib_hbase} +ln -f -s %{hadoop_home}/client/hadoop-yarn-server-common.jar $RPM_BUILD_ROOT/%{lib_hbase} + %pre getent group hbase 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hbase getent passwd hbase 2>&1 > /dev/null || /usr/sbin/useradd -c "HBase" -s /sbin/nologin -g hbase -r -d /var/lib/hbase hbase 2> /dev/null || : http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index c52d0c0..04a0d80 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -16,7 +16,6 @@ %define bin_phoenix %{phoenix_home}/bin %define etc_phoenix_conf %{_sysconfdir}/%{name}/conf %define etc_phoenix_conf_dist %{etc_phoenix_conf}.dist -%define lib_phoenix %{phoenix_home}/lib %define var_lib_phoenix /var/lib/%{name} %define var_log_phoenix /var/log/%{name} %define man_dir %{_mandir} @@ -133,24 +132,6 @@ bash %{SOURCE2} \ %__install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/default/%{name} %__install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/etc/default/%{name}-queryserver -# Pull zookeeper, hadoop, hadoop-mapreduce, hadoop-yarn, and hbase deps from their packages -rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/zookeeper*.jar -ln -f -s %{zookeeper_home}/zookeeper.jar $RPM_BUILD_ROOT/%{lib_phoenix} -rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/hadoop*.jar -ln -f -s %{hadoop_home}/hadoop-annotations.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hadoop_home}/hadoop-auth.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hadoop_home}/hadoop-common.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hadoop_mapreduce_home}/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hadoop_hdfs_home}/hadoop-hdfs.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hadoop_yarn_home}/hadoop-yarn-api.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hadoop_yarn_home}/hadoop-yarn-common.jar $RPM_BUILD_ROOT/%{lib_phoenix} -rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/hbase*.jar -ln -f -s %{hbase_home}/hbase-testing-util.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hbase_home}/hbase-it.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hbase_home}/hbase-common.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hbase_home}/hbase-protocol.jar $RPM_BUILD_ROOT/%{lib_phoenix} -ln -f -s %{hbase_home}/hbase-client.jar $RPM_BUILD_ROOT/%{lib_phoenix} - # Install init script init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-queryserver bash $RPM_SOURCE_DIR/init.d.tmpl $RPM_SOURCE_DIR/%{name}-queryserver.svc rpm $init_file @@ -176,7 +157,6 @@ fi %defattr(-,root,root,755) %doc %{doc_phoenix} %{phoenix_home}/phoenix-*.jar -%{lib_phoenix} %{bin_phoenix} %config(noreplace) %{etc_phoenix_conf_dist} %config(noreplace) %{_sysconfdir}/default/phoenix http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 56db5b0..30b7f11 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -93,7 +93,7 @@ bigtop { 'phoenix', 'tachyon', 'kafka', 'ycsb', 'kite', 'hama', 'zeppelin', 'tajo', 'apex' ], - hbase:['phoenix','giraph','ycsb'], + hbase:['phoenix','giraph','ycsb','hive'], pig:['datafu', 'oozie'], hive:['oozie', 'pig','zeppelin'], 'ignite-hadoop':['zeppelin'], @@ -143,7 +143,7 @@ bigtop { 'hbase' { name = 'hbase' relNotes = 'Apache HBase' - version { base = '0.98.17'; pkg = base; release = 1 } + version { base = '1.1.3'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}.tar.gz" source = "${name}-${version.base}-src.tar.gz" } url { download_path = "/$name/${version.base}/" @@ -300,7 +300,7 @@ bigtop { * to the base HBase version. Update as needed whenever changing the * HBase version in the BOM. */ - phoenix.hbase ='HBase-0.98' + phoenix.hbase ='HBase-1.1' version { base = "4.7.0-${phoenix.hbase}"; pkg = '4.7.0'; release = 1 } tarball { destination = "$name-${version.base}-src.tar.gz" source = destination } http://git-wip-us.apache.org/repos/asf/bigtop/blob/73eccc48/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3b4d14c..5d3781e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ <properties> <hadoop.version>2.7.2</hadoop.version> <!--An awful hack for BIGTOP-1429--> - <hbase.version>0.98.17-hadoop2</hbase.version> + <hbase.version>1.1.3</hbase.version> <pig.version>0.12.1</pig.version> <pig-smoke.version>0.12.1</pig-smoke.version> <sqoop.version>1.4.5</sqoop.version>
