BIGTOP-982. hcatalog needs to be given HCATATALOG_HOME and HIVE_HOME

Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/bfcc351f
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/bfcc351f
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/bfcc351f

Branch: refs/heads/master
Commit: bfcc351f3411b29650f6c2c8a30f8e0609313630
Parents: 040a29a
Author: Roman Shaposhnik <[email protected]>
Authored: Sun May 12 14:10:35 2013 -0700
Committer: Roman Shaposhnik <[email protected]>
Committed: Sun May 12 14:10:35 2013 -0700

----------------------------------------------------------------------
 .../src/common/hcatalog/hcatalog-server.default    |    2 ++
 .../src/common/hcatalog/install_hcatalog.sh        |    5 +++++
 .../src/common/hcatalog/webhcat-server.default     |    2 ++
 3 files changed, 9 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/bfcc351f/bigtop-packages/src/common/hcatalog/hcatalog-server.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/hcatalog-server.default 
b/bigtop-packages/src/common/hcatalog/hcatalog-server.default
index 950cf22..a7238ff 100644
--- a/bigtop-packages/src/common/hcatalog/hcatalog-server.default
+++ b/bigtop-packages/src/common/hcatalog/hcatalog-server.default
@@ -18,6 +18,8 @@ export METASTORE_PORT=9083
 export HADOOP_PREFIX=/usr
 export HCAT_LOG_DIR=/var/log/hcatalog
 export HCAT_PID_DIR=/var/run/hcatalog
+export HCAT_HOME=/usr/lib/hcatalog
 # FIXME: HCATALOG-636 (and also HIVE-2757)
 export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
 export HIVE_HOME=/usr/lib/hive
+export HIVE_CONF_DIR=/etc/hive/conf

http://git-wip-us.apache.org/repos/asf/bigtop/blob/bfcc351f/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/install_hcatalog.sh 
b/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
index e90e092..bc5afc6 100644
--- a/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
+++ b/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
@@ -120,6 +120,11 @@ cat >>$wrapper <<EOF
 # Autodetect JAVA_HOME if not defined
 . /usr/lib/bigtop-utils/bigtop-detect-javahome
 
+# FIXME: HCATALOG-636 (and also HIVE-2757)
+export HIVE_HOME=/usr/lib/hive
+export HIVE_CONF_DIR=/etc/hive/conf
+export HCAT_HOME=$INSTALLED_LIB_DIR
+
 export HCATALOG_HOME=$INSTALLED_LIB_DIR
 exec $INSTALLED_LIB_DIR/bin/hcat "\$@"
 EOF

http://git-wip-us.apache.org/repos/asf/bigtop/blob/bfcc351f/bigtop-packages/src/common/hcatalog/webhcat-server.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/webhcat-server.default 
b/bigtop-packages/src/common/hcatalog/webhcat-server.default
index d85d66a..3c7921d 100644
--- a/bigtop-packages/src/common/hcatalog/webhcat-server.default
+++ b/bigtop-packages/src/common/hcatalog/webhcat-server.default
@@ -19,3 +19,5 @@ export WEBHCAT_LOG_DIR=/var/log/hcatalog
 export WEBHCAT_PID_DIR=/var/run/hcatalog
 # FIXME: HCATALOG-636
 export HIVE_HOME=/usr/lib/hive
+export HIVE_CONF_DIR=/etc/hive/conf
+export HCAT_HOME=/usr/lib/hcatalog

Reply via email to