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 2013/05/03 00:52:01 UTC

[1/7] git commit: BIGTOP-956. fix small issues with mahout, hue and oozie tests

Updated Branches:
  refs/heads/master 25463a414 -> 38eafa088


BIGTOP-956. fix small issues with mahout, hue and oozie tests


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

Branch: refs/heads/master
Commit: a07ebbb34ee46295cc7e1ecbf97c1bf0c8981662
Parents: 25463a4
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Thu May 2 09:54:46 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 09:54:46 2013 -0700

----------------------------------------------------------------------
 .../itest/mahout/smoke/TestMahoutExamples.groovy   |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/a07ebbb3/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy b/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
index 8cc8efc..39ee306 100644
--- a/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
+++ b/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
@@ -65,6 +65,8 @@ public class TestMahoutExamples {
             "cd 20news-bydate",
             "tar xzf ${download_dir}/20news-bydate.tar.gz",
             "cd ..",
+            "mkdir 20news-all",
+            "cp -R 20news-bydate/*/* 20news-all",
             "mkdir reuters-sgm",
             "cd reuters-sgm",
             "tar xzf ${download_dir}/reuters21578.tar.gz",


[3/7] git commit: BIGTOP-954. metadada and user data for sqoop and hcatalog packages are wrong

Posted by rv...@apache.org.
BIGTOP-954. metadada and user data for sqoop and hcatalog packages are wrong


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

Branch: refs/heads/master
Commit: 46fde118a05fb1b3a08e144968901014bc3381fd
Parents: bbd034e
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Thu May 2 10:37:30 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 10:37:34 2013 -0700

----------------------------------------------------------------------
 .../src/main/resources/yum/package_data.xml        |    2 +-
 .../src/main/resources/zypper/package_data.xml     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/46fde118/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
index 4d0ac42..45ff956 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
@@ -105,7 +105,7 @@
     <users>
       <hcatalog>
         <home>/var/run/hcatalog</home>
-        <descr>HCatalog</descr>
+        <descr>HCatalog User</descr>
         <shell>/sbin/nologin</shell>
       </hcatalog>
     </users>

http://git-wip-us.apache.org/repos/asf/bigtop/blob/46fde118/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
index fb5fafc..38bc228 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
@@ -104,7 +104,7 @@
     <users>
       <hcatalog>
         <home>/var/run/hcatalog</home>
-        <descr>HCatalog</descr>
+        <descr>HCatalog User</descr>
         <shell>/sbin/nologin</shell>
       </hcatalog>
     </users>


[6/7] git commit: BIGTOP-960. Remove workaround for HBASE-6263 in hbase-thrift start

Posted by rv...@apache.org.
BIGTOP-960. Remove workaround for HBASE-6263 in hbase-thrift start


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

Branch: refs/heads/master
Commit: 95d8631d28c4635eb94095bcc2c9b76fb97146a2
Parents: 374cb2f
Author: Anatoli Fomenko <fa...@apache.org>
Authored: Thu May 2 12:09:13 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 15:06:07 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/hbase/hbase.default     |    1 -
 .../src/deb/hbase/install_init_scripts.sh          |    2 --
 bigtop-packages/src/rpm/hbase/SPECS/hbase.spec     |    3 ---
 3 files changed, 0 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/95d8631d/bigtop-packages/src/common/hbase/hbase.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/hbase.default b/bigtop-packages/src/common/hbase/hbase.default
index 3371a2b..910ab86 100644
--- a/bigtop-packages/src/common/hbase/hbase.default
+++ b/bigtop-packages/src/common/hbase/hbase.default
@@ -16,7 +16,6 @@
 export HBASE_PID_DIR="/var/run/hbase"
 export HBASE_LOG_DIR="/var/log/hbase"
 export HBASE_IDENT_STRING=hbase
-export HBASE_THRIFT_MODE="-nonblocking"
 
 # Up to 100 region servers can be run on a single host by specifying offsets
 # here or as CLI args when using init scripts. Each offset identifies an

http://git-wip-us.apache.org/repos/asf/bigtop/blob/95d8631d/bigtop-packages/src/deb/hbase/install_init_scripts.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/install_init_scripts.sh b/bigtop-packages/src/deb/hbase/install_init_scripts.sh
index 07e8f21..c32a5b7 100755
--- a/bigtop-packages/src/deb/hbase/install_init_scripts.sh
+++ b/bigtop-packages/src/deb/hbase/install_init_scripts.sh
@@ -41,5 +41,3 @@ for node in master regionserver rest thrift ; do
 
 done
 
-# FIXME: BIGTOP-648 workaround for HBASE-6263
-sed -i -e 's# start thrift"# start thrift $HBASE_THRIFT_MODE"#' debian/hbase-thrift/etc/init.d/hbase-thrift

http://git-wip-us.apache.org/repos/asf/bigtop/blob/95d8631d/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 37e683b..523899a 100644
--- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
+++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
@@ -278,9 +278,6 @@ do
     chmod 755 $init_file
 done
 
-# FIXME: BIGTOP-648 workaround for HBASE-6263
-sed -i -e 's# start thrift# start thrift \$HBASE_THRIFT_MODE#' $RPM_BUILD_ROOT/%{initd_dir}/hbase-thrift
-
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 
 # Pull zookeeper and hadoop from their packages


[7/7] git commit: BIGTOP-945. Service lock files need to match init script name

Posted by rv...@apache.org.
BIGTOP-945. Service lock files need to match init script name


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

Branch: refs/heads/master
Commit: 38eafa088167da44c26156f056623742e12aac01
Parents: 95d8631
Author: Sean Mackrory <se...@cloudera.com>
Authored: Thu May 2 09:08:59 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 15:08:18 2013 -0700

----------------------------------------------------------------------
 .../src/common/hadoop/hadoop-hdfs-datanode.svc     |    2 --
 .../src/common/hadoop/hadoop-hdfs-journalnode.svc  |    2 --
 .../src/common/hadoop/hadoop-hdfs-namenode.svc     |    2 --
 .../hadoop/hadoop-hdfs-secondarynamenode.svc       |    2 --
 .../src/common/hadoop/hadoop-hdfs-zkfc.svc         |    2 --
 .../src/common/hadoop/hadoop-httpfs.svc            |    2 --
 .../hadoop/hadoop-mapreduce-historyserver.svc      |    2 --
 .../src/common/hadoop/hadoop-yarn-nodemanager.svc  |    2 --
 .../src/common/hadoop/hadoop-yarn-proxyserver.svc  |    2 --
 .../common/hadoop/hadoop-yarn-resourcemanager.svc  |    2 --
 bigtop-packages/src/common/hbase/hbase.svc         |    2 --
 .../src/common/hcatalog/hcatalog-server.svc        |    2 --
 .../src/common/hcatalog/webhcat-server.svc         |    2 --
 bigtop-packages/src/common/hive/hive-metastore.svc |    2 --
 bigtop-packages/src/common/hive/hive-server.svc    |    2 --
 bigtop-packages/src/common/sqoop/sqoop-server.svc  |    2 --
 bigtop-packages/src/templates/init.d.tmpl          |    4 ++--
 17 files changed, 2 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
index 5d4d71b..9f7ef8a 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
@@ -20,8 +20,6 @@ SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 
 generate_start() {
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
index 2afafb8..431a99c 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
@@ -20,5 +20,3 @@ SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
index 4fdcb3f..6ace898 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
@@ -20,8 +20,6 @@ SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 
 generate_extra_commands() {
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
index 15d37f0..3164566 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
@@ -20,5 +20,3 @@ SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
index 9b926f6..aaa1d28 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
@@ -20,5 +20,3 @@ SVC_USER="hdfs"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
index f0ad005..def1c65 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
@@ -20,8 +20,6 @@ SVC_USER="$HADOOP_NAME"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/$DAEMON/conf"
 PIDFILE="/var/run/$DAEMON/hadoop-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 
 CHKCONFIG=${CHKCONFIG:-"2345 90 10"}
 CHKCONFIG="${CHKCONFIG%% *} 90 10"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
index 4271a61..ee4c4f7 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
@@ -20,6 +20,4 @@ SVC_USER="mapred"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-mapreduce/mapred-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 CHKCONFIG="2345 95 15"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
index 8926464..e5950cd 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
@@ -20,6 +20,4 @@ SVC_USER="yarn"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 CHKCONFIG="2345 95 15"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
index db62c98..0cd2e1c 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
@@ -20,6 +20,4 @@ SVC_USER="yarn"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 CHKCONFIG="2345 95 15"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
index 658963b..f3b724e 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
@@ -20,6 +20,4 @@ SVC_USER="yarn"
 DAEMON_FLAGS="$HADOOP_NAME"
 CONF_DIR="/etc/hadoop/conf"
 PIDFILE="/var/run/hadoop-yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hadoop-$HADOOP_NAME"
 CHKCONFIG="2345 95 15"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hbase/hbase.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/hbase.svc b/bigtop-packages/src/common/hbase/hbase.svc
index c3a9d16..091c4d9 100644
--- a/bigtop-packages/src/common/hbase/hbase.svc
+++ b/bigtop-packages/src/common/hbase/hbase.svc
@@ -20,8 +20,6 @@ SVC_USER="hbase"
 DAEMON_FLAGS=""
 CONF_DIR="/etc/hbase/conf"
 PIDFILE="/var/run/hbase/hbase-${DAEMON}.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="${DAEMON}"
 
 generate_functions() {
 cat <<'__EOT__'

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hcatalog/hcatalog-server.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc
index 04aaaf2..029f5b1 100644
--- a/bigtop-packages/src/common/hcatalog/hcatalog-server.svc
+++ b/bigtop-packages/src/common/hcatalog/hcatalog-server.svc
@@ -20,5 +20,3 @@ DAEMON_FLAGS=""
 CONF_DIR="/etc/hcatalog/conf"
 # FIXME: HCATALOG-636
 PIDFILE="/var/run/hcatalog/hcat.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="hcatalog-server"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hcatalog/webhcat-server.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/webhcat-server.svc b/bigtop-packages/src/common/hcatalog/webhcat-server.svc
index 6f275f7..4d934c6 100644
--- a/bigtop-packages/src/common/hcatalog/webhcat-server.svc
+++ b/bigtop-packages/src/common/hcatalog/webhcat-server.svc
@@ -20,5 +20,3 @@ DAEMON_FLAGS=""
 CONF_DIR="/etc/webhcat/conf"
 # FIXME: HCATALOG-636
 PIDFILE="/var/run/hcatalog/webhcat.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="webhcat-server"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hive/hive-metastore.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/hive-metastore.svc b/bigtop-packages/src/common/hive/hive-metastore.svc
index 10a9a62..d552f95 100644
--- a/bigtop-packages/src/common/hive/hive-metastore.svc
+++ b/bigtop-packages/src/common/hive/hive-metastore.svc
@@ -20,8 +20,6 @@ SVC_USER="hive"
 DAEMON_FLAGS=""
 CONF_DIR="/etc/hive/conf"
 PIDFILE="/var/run/hive/${DAEMON}.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="${DAEMON}"
 
 generate_start() {
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/hive/hive-server.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/hive-server.svc b/bigtop-packages/src/common/hive/hive-server.svc
index 049e814..8e1bce9 100644
--- a/bigtop-packages/src/common/hive/hive-server.svc
+++ b/bigtop-packages/src/common/hive/hive-server.svc
@@ -20,8 +20,6 @@ SVC_USER="hive"
 DAEMON_FLAGS=""
 CONF_DIR="/etc/hive/conf"
 PIDFILE="/var/run/hive/${DAEMON}.pid"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="${DAEMON}"
 
 generate_start() {
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/common/sqoop/sqoop-server.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/sqoop/sqoop-server.svc b/bigtop-packages/src/common/sqoop/sqoop-server.svc
index dba8970..916032d 100644
--- a/bigtop-packages/src/common/sqoop/sqoop-server.svc
+++ b/bigtop-packages/src/common/sqoop/sqoop-server.svc
@@ -20,8 +20,6 @@ SVC_USER="${SQOOP_USER:-sqoop}"
 DAEMON_FLAGS=""
 CONF_DIR="${SQOOP_CONFIG:-/etc/sqoop/conf}"
 PIDFILE="${SQOOP_PID:-/var/run/sqoop/sqoop-server-$SVC_USER.pid}"
-LOCKDIR="/var/lock/subsys"
-LOCKFILE="sqoop-server"
 
 generate_functions() {
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/38eafa08/bigtop-packages/src/templates/init.d.tmpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/templates/init.d.tmpl b/bigtop-packages/src/templates/init.d.tmpl
index 9f51414..4801326 100644
--- a/bigtop-packages/src/templates/init.d.tmpl
+++ b/bigtop-packages/src/templates/init.d.tmpl
@@ -216,8 +216,8 @@ SVC_USER="$SVC_USER"
 DAEMON_FLAGS="$DAEMON_FLAGS"
 CONF_DIR="$CONF_DIR"
 PIDFILE="$PIDFILE"
-LOCKDIR="$LOCKDIR"
-LOCKFILE="\$LOCKDIR/$LOCKFILE"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="\$LOCKDIR/$DAEMON"
 
 install -d -m 0755 -o $SVC_USER -g $SVC_USER $(dirname $PIDFILE) 1>/dev/null 2>&1 || :
 [ -d "\$LOCKDIR" ] || install -d -m 0755 \$LOCKDIR 1>/dev/null 2>&1 || :


[5/7] git commit: BIGTOP-881. Add support for Oozie to be configured with SSL (HTTPS)

Posted by rv...@apache.org.
BIGTOP-881. Add support for Oozie to be configured with SSL (HTTPS)


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

Branch: refs/heads/master
Commit: 374cb2fe8bce56960a9dcad7fe44eff7b4058a08
Parents: bc11469
Author: Sean Mackrory <ma...@gmail.com>
Authored: Mon Apr 15 13:16:59 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 10:40:19 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/oozie/install_oozie.sh |   11 ++++++++++-
 bigtop-packages/src/deb/oozie/rules               |    3 +++
 bigtop-packages/src/rpm/oozie/SPECS/oozie.spec    |    5 +++++
 3 files changed, 18 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cb2fe/bigtop-packages/src/common/oozie/install_oozie.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 5b260d6..7f67a1f 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -189,7 +189,7 @@ for i in `cd ${BUILD_DIR}/libtools ; ls *` ; do
   fi
 done
 
-# Create an exploded-war oozie deployment in /var/lib/oozie
+# Create an exploded-war oozie deployment in /usr/lib/oozie
 install -d -m 0755 ${SERVER_LIB_DIR}/oozie-server
 cp -R ${BUILD_DIR}/oozie-server/conf ${SERVER_LIB_DIR}/oozie-server/conf
 cp ${EXTRA_DIR}/context.xml ${SERVER_LIB_DIR}/oozie-server/conf/
@@ -198,3 +198,12 @@ ln -s ../webapps ${SERVER_LIB_DIR}/oozie-server/webapps
 
 # Provide a convenience symlink to be more consistent with tarball deployment
 ln -s ${DATA_DIR#${SERVER_PREFIX}} ${SERVER_LIB_DIR}/libext
+
+# Create an exploded-war oozie deployment in /usr/lib/oozie/oozie-server-ssl for SSL
+cp -r ${SERVER_LIB_DIR}/oozie-server ${SERVER_LIB_DIR}/oozie-server-ssl
+cp -r ${SERVER_LIB_DIR}/webapps ${SERVER_LIB_DIR}/webapps-ssl
+rm -r ${SERVER_LIB_DIR}/oozie-server-ssl/webapps
+ln -s ../webapps-ssl ${SERVER_LIB_DIR}/oozie-server-ssl/webapps
+cp ${BUILD_DIR}/oozie-server/conf/ssl/ssl-server.xml ${SERVER_LIB_DIR}/oozie-server-ssl/conf/server.xml
+cp ${BUILD_DIR}/oozie-server/conf/ssl/ssl-web.xml ${SERVER_LIB_DIR}/webapps-ssl/oozie/WEB-INF/web.xml
+

http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cb2fe/bigtop-packages/src/deb/oozie/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/oozie/rules b/bigtop-packages/src/deb/oozie/rules
index 531aeb2..bb1e6c0 100755
--- a/bigtop-packages/src/deb/oozie/rules
+++ b/bigtop-packages/src/deb/oozie/rules
@@ -40,3 +40,6 @@ override_dh_auto_install:
 	ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps/oozie/ext-2.2
 	rm -rf                        debian/oozie/usr/lib/oozie/webapps/oozie/docs
 	ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps/oozie/docs
+	ln -s -f /var/lib/oozie/ext-2.2 debian/oozie/usr/lib/oozie/webapps-ssl/oozie/ext-2.2
+	rm -rf                        debian/oozie/usr/lib/oozie/webapps-ssl/oozie/docs
+	ln -s -f /usr/share/doc/oozie debian/oozie/usr/lib/oozie/webapps-ssl/oozie/docs

http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cb2fe/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
index 12ffd19..4bbc212 100644
--- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
+++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
@@ -142,6 +142,9 @@ Requires: bigtop-utils >= 0.6
 %__ln_s -f %{data_oozie}/ext-2.2 $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/ext-2.2
 %__rm  -rf              $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
 %__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapps/oozie/docs
+%__ln_s -f %{data_oozie}/ext-2.2 $RPM_BUILD_ROOT/%{lib_oozie}/webapps-ssl/oozie/ext-2.2
+%__rm  -rf              $RPM_BUILD_ROOT/%{lib_oozie}/webapps-ssl/oozie/docs
+%__ln_s -f %{doc_oozie} $RPM_BUILD_ROOT/%{lib_oozie}/webapps-ssl/oozie/docs
 
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
@@ -177,10 +180,12 @@ fi
 %{lib_oozie}/bin/oozied.sh
 %{lib_oozie}/bin/ooziedb.sh
 %{lib_oozie}/webapps
+%{lib_oozie}/webapps-ssl
 %{lib_oozie}/libtools
 %{lib_oozie}/libserver
 %{lib_oozie}/oozie-sharelib.tar.gz
 %{lib_oozie}/oozie-server
+%{lib_oozie}/oozie-server-ssl
 %{lib_oozie}/libext
 %{initd_dir}/oozie
 %defattr(-, oozie, oozie)


[2/7] git commit: BIGTOP-926. Bump version of Giraph to 1.0.0

Posted by rv...@apache.org.
BIGTOP-926. Bump version of Giraph to 1.0.0


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

Branch: refs/heads/master
Commit: bbd034e2480c9891299d789c993045ec0403a31d
Parents: a07ebbb
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Mon Apr 15 12:55:37 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 09:59:42 2013 -0700

----------------------------------------------------------------------
 .../src/common/giraph/do-component-build           |    6 ++-
 .../src/common/giraph/install_giraph.sh            |   28 ++++++++++-----
 bigtop-packages/src/deb/giraph/rules               |    2 +-
 bigtop-packages/src/rpm/giraph/SPECS/giraph.spec   |    5 +--
 bigtop.mk                                          |   15 +++-----
 5 files changed, 32 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/common/giraph/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/giraph/do-component-build b/bigtop-packages/src/common/giraph/do-component-build
index d7c744e..76106f7 100644
--- a/bigtop-packages/src/common/giraph/do-component-build
+++ b/bigtop-packages/src/common/giraph/do-component-build
@@ -18,5 +18,7 @@ set -ex
 
 . `dirname $0`/bigtop.bom
 
-mvn -Phadoop_trunk -DskipTests -Dhadoop.version=$HADOOP_VERSION site package "$@"
-tar --strip-components 1 -C target -xzf target/giraph-*-bin.tar.gz
+mvn -Phadoop_yarn -DskipTests -Dhadoop.version=$HADOOP_VERSION clean package "$@"
+# FIXME: GIRAPH-640
+# mvn -Phadoop_yarn -DskipTests -Dhadoop.version=$HADOOP_VERSION site "$@"
+(cd giraph-core/target ; tar --strip-components 1 -xzf giraph-*-bin.tar.gz)

http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/common/giraph/install_giraph.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/giraph/install_giraph.sh b/bigtop-packages/src/common/giraph/install_giraph.sh
index c9d51d0..011ef77 100644
--- a/bigtop-packages/src/common/giraph/install_giraph.sh
+++ b/bigtop-packages/src/common/giraph/install_giraph.sh
@@ -107,20 +107,30 @@ CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist}
 
 install -d -m 0755 ${PREFIX}/${LIB_DIR}
 
+# Installing Giraph core
 install -d -m 0755 ${PREFIX}/${LIB_DIR}
-mv $BUILD_DIR/lib/giraph*.jar $BUILD_DIR/
-cp $BUILD_DIR/giraph*.jar ${PREFIX}/${LIB_DIR}
+cp $BUILD_DIR/giraph-core/target/*.jar ${PREFIX}/${LIB_DIR}
 
 install -d -m 0755 ${PREFIX}/${LIB_DIR}/lib
-cp -a $BUILD_DIR/lib/*.jar ${PREFIX}/${LIB_DIR}/lib
+cp $BUILD_DIR/giraph-core/target/lib/*.jar ${PREFIX}/${LIB_DIR}/lib
 
-install -d -m 0755 $PREFIX/usr/bin
+# Installing various Giraph modules
+cp $BUILD_DIR/giraph-hive/target/*.jar ${PREFIX}/${LIB_DIR}
+# FIXME: cp $BUILD_DIR/giraph-hbase/target/*.jar ${PREFIX}/${LIB_DIR}
+# FIXME: cp $BUILD_DIR/giraph-hcatalog/target/*.jar ${PREFIX}/${LIB_DIR}
 
-install -d -m 0755 $PREFIX/${BIN_DIR}
-cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR}
+# Remove things we don't need
+rm -f ${PREFIX}/${LIB_DIR}/*tests.jar ${PREFIX}/${LIB_DIR}/*javadoc.jar ${PREFIX}/${LIB_DIR}/*sources.jar
 
+# Installing docs and examples
 install -d -m 0755 $PREFIX/${DOC_DIR}
-cp -r $BUILD_DIR/docs/*  $PREFIX/${DOC_DIR}
+cp -r $BUILD_DIR/giraph-core/target/site/apidocs/*  $PREFIX/${DOC_DIR}
+cp $BUILD_DIR/giraph-examples/target/*.jar $PREFIX/${DOC_DIR}
+
+# Install executable wrappers
+install -d -m 0755 $PREFIX/usr/bin
+install -d -m 0755 $PREFIX/${BIN_DIR}
+cp $BUILD_DIR/bin/* $PREFIX/${BIN_DIR}
 
 for i in giraph ; do
 	#echo "Copying manpage $i"
@@ -151,8 +161,8 @@ unlink $PREFIX/$LIB_DIR/conf || /bin/true
 ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
 
 # Create version independent symlinks
-ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep -v javadoc.jar | grep -v sources.jar | grep -v tests.jar | grep -v jar-with-dependencies.jar` $PREFIX/$LIB_DIR/giraph.jar
-ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep jar-with-dependencies.jar` $PREFIX/$LIB_DIR/giraph-jar-with-dependencies.jar
+ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep -v jar-with-dependencies.jar | grep -v giraph-hive` $PREFIX/$LIB_DIR/giraph.jar
+ln -s `cd $PREFIX/$LIB_DIR ; ls giraph*jar | grep jar-with-dependencies.jar    | grep -v giraph-hive` $PREFIX/$LIB_DIR/giraph-jar-with-dependencies.jar
 
 # Workaround for GIRAPH-205
 ln -s ../giraph.jar $PREFIX/$LIB_DIR/lib

http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/deb/giraph/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/giraph/rules b/bigtop-packages/src/deb/giraph/rules
index fc62b3a..7b3a15a 100644
--- a/bigtop-packages/src/deb/giraph/rules
+++ b/bigtop-packages/src/deb/giraph/rules
@@ -31,7 +31,7 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	sh -x debian/install_giraph.sh     \
-	  --build-dir=target               \
+	  --build-dir=${PWD}               \
 	  --conf-dir=/etc/giraph/conf.dist \
           --doc-dir=/usr/share/doc/giraph  \
 	  --prefix=debian/giraph

http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
index 430308f..d2650b7 100644
--- a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
+++ b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec
@@ -65,8 +65,7 @@ Requires: zookeeper, hadoop-client, bigtop-utils >= 0.6
 Giraph implements a graph processing platform to run large scale algorithms (such as page rank, shared connections, personalization-based popularity, etc.) on top of Hadoop infrastructure. Giraph builds upon the graph-oriented nature of Pregel but additionally adds fault-tolerance to the coordinator process with the use of ZooKeeper as its centralized coordination service.
 
 %prep
-#%setup -n %{name}-%{giraph_base_version}-src
-%setup -n apache-giraph-79962a3
+%setup -n %{name}-%{giraph_base_version}
 
 %build
 bash %{SOURCE1}
@@ -74,7 +73,7 @@ bash %{SOURCE1}
 %install
 %__rm -rf $RPM_BUILD_ROOT
 sh %{SOURCE2} \
-          --build-dir=target \
+          --build-dir=`pwd` \
           --conf-dir=%{conf_giraph}.dist \
           --doc-dir=%{doc_giraph} \
           --prefix=$RPM_BUILD_ROOT

http://git-wip-us.apache.org/repos/asf/bigtop/blob/bbd034e2/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 64563ff..4ddd859 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -173,17 +173,14 @@ $(eval $(call PACKAGE,flume,FLUME))
 GIRAPH_NAME=giraph
 GIRAPH_RELNOTES_NAME=Giraph
 GIRAPH_PKG_NAME=giraph
-GIRAPH_BASE_VERSION=0.2-SNAPSHOT
-GIRAPH_PKG_VERSION=0.2
+GIRAPH_BASE_VERSION=1.0.0
+GIRAPH_PKG_VERSION=1.0.0
 GIRAPH_RELEASE_VERSION=1
 GIRAPH_TARBALL_DST=$(GIRAPH_NAME)-$(GIRAPH_BASE_VERSION).tar.gz
-#GIRAPH_TARBALL_SRC=$(GIRAPH_NAME)-$(GIRAPH_BASE_VERSION)-src.tar.gz
-#GIRAPH_DOWNLOAD_PATH=/incubator/giraph/$(GIRAPH_PKG_NAME)-$(GIRAPH_BASE_VERSION)
-#GIRAPH_SITE=$(APACHE_MIRROR)$(GIRAPH_DOWNLOAD_PATH)
-#GIRAPH_ARCHIVE=$(APACHE_ARCHIVE)$(GIRAPH_DOWNLOAD_PATH)
-GIRAPH_TARBALL_SRC=79962a3
-GIRAPH_SITE=https://github.com/apache/giraph/tarball
-GIRAPH_ARCHIVE=$(GIRAPH_SITE)
+GIRAPH_TARBALL_SRC=$(GIRAPH_TARBALL_DST)
+GIRAPH_DOWNLOAD_PATH=/giraph/$(GIRAPH_PKG_NAME)-$(GIRAPH_BASE_VERSION)
+GIRAPH_SITE=$(APACHE_MIRROR)$(GIRAPH_DOWNLOAD_PATH)
+GIRAPH_ARCHIVE=$(APACHE_ARCHIVE)$(GIRAPH_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,giraph,GIRAPH))
 
 # Hue


[4/7] git commit: BIGTOP-756. Provide the thrift API interface file in the HBase packages

Posted by rv...@apache.org.
BIGTOP-756. Provide the thrift API interface file in the HBase packages


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

Branch: refs/heads/master
Commit: bc114699cc6aec1f747d68766959c37dc40c7282
Parents: 46fde11
Author: Anatoli Fomenko <fa...@apache.org>
Authored: Wed May 1 19:07:03 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Thu May 2 10:39:09 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/hbase/install_hbase.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/bc114699/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 3df001e..f23cd27 100755
--- a/bigtop-packages/src/common/hbase/install_hbase.sh
+++ b/bigtop-packages/src/common/hbase/install_hbase.sh
@@ -102,6 +102,7 @@ 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}
+THRIFT_DIR=${THRIFT_DIR:-${LIB_DIR}/include/thrift}
 
 install -d -m 0755 $PREFIX/$LIB_DIR
 install -d -m 0755 $PREFIX/$LIB_DIR/lib
@@ -109,6 +110,7 @@ install -d -m 0755 $PREFIX/$DOC_DIR
 install -d -m 0755 $PREFIX/$BIN_DIR
 install -d -m 0755 $PREFIX/$ETC_DIR
 install -d -m 0755 $PREFIX/$MAN_DIR
+install -d -m 0755 $PREFIX/$THRIFT_DIR
 
 cp -ra $BUILD_DIR/lib/* ${PREFIX}/${LIB_DIR}/lib/
 cp $BUILD_DIR/hbase*.jar $PREFIX/$LIB_DIR
@@ -125,6 +127,9 @@ for file in rolling-restart.sh graceful_stop.sh local-regionservers.sh \
   rm -f $PREFIX/$BIN_DIR/$file
 done
 
+cp $BUILD_DIR/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift $PREFIX/$THRIFT_DIR/hbase1.thrift
+cp $BUILD_DIR/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift $PREFIX/$THRIFT_DIR/hbase2.thrift
+
 ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
 
 # Make a symlink of hbase.jar to hbase-version.jar