You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2011/10/27 00:48:37 UTC
svn commit: r1189514 - in /incubator/bigtop/trunk/bigtop-packages/src:
common/hive/hadoop-hive.sh common/hive/hadoop-hive.sh.suse
common/hive/install_hive.sh deb/hive/control
rpm/hive/SOURCES/install_hive.sh rpm/hive/SPECS/hive.spec
Author: bmahe
Date: Wed Oct 26 22:48:36 2011
New Revision: 1189514
URL: http://svn.apache.org/viewvc?rev=1189514&view=rev
Log:
BIGTOP-179. All of Hive wrapper scripts and init.d scripts need to start include find-java code from bigtop-utils
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh
incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh.suse
incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh?rev=1189514&r1=1189513&r2=1189514&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh Wed Oct 26 22:48:36 2011
@@ -30,6 +30,14 @@
# Short-Description: hive
### END INIT INFO
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh.suse?rev=1189514&r1=1189513&r2=1189514&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh.suse (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh.suse Wed Oct 26 22:48:36 2011
@@ -34,6 +34,13 @@
source /lib/lsb/init-functions
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh?rev=1189514&r1=1189513&r2=1189514&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh Wed Oct 26 22:48:36 2011
@@ -120,6 +120,14 @@ do
cat >>$wrapper <<EOF
#!/bin/sh
. /etc/default/hadoop
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
export HIVE_HOME=$INSTALLED_LIB_DIR
exec $INSTALLED_LIB_DIR/bin/$file "\$@"
EOF
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control?rev=1189514&r1=1189513&r2=1189514&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control Wed Oct 26 22:48:36 2011
@@ -23,7 +23,7 @@ Homepage: http://hadoop.apache.org/hive/
Package: hadoop-hive
Architecture: all
-Depends: adduser, hadoop
+Depends: adduser, hadoop, bigtop-utils
Description: A data warehouse infrastructure built on top of Hadoop
Hive is a data warehouse infrastructure built on top of Hadoop that
provides tools to enable easy data summarization, adhoc querying and
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh?rev=1189514&r1=1189513&r2=1189514&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh Wed Oct 26 22:48:36 2011
@@ -120,7 +120,15 @@ do
cat >>$wrapper <<EOF
#!/bin/sh
-export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
+source /etc/default/hadoop
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
export HIVE_HOME=$INSTALLED_LIB_DIR
exec $INSTALLED_LIB_DIR/bin/$file "\$@"
EOF
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1189514&r1=1189513&r2=1189514&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Wed Oct 26 22:48:36 2011
@@ -70,7 +70,7 @@ Source5: hadoop-hive-server.default
Source6: hadoop-hive-metastore.default
Source7: hive.1
Source8: hive-site.xml
-Requires: hadoop >= 0.20.1
+Requires: hadoop >= 0.20.2, bigtop-utils
Obsoletes: %{name}-webinterface
%description