Updated Branches: refs/heads/master c0beeb553 -> 9914667c3
BIGTOP-811. Add /var/lib/bigtop as a location to install SQL connectors and other plug-ins Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9914667c Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9914667c Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9914667c Branch: refs/heads/master Commit: 9914667c321aa261d66bf6ca5c118ca415e520f4 Parents: c0beeb5 Author: Sean Mackrory <[email protected]> Authored: Fri Jul 12 13:09:02 2013 -0700 Committer: Sean Mackrory <[email protected]> Committed: Fri Jul 12 13:09:02 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/bigtop-utils/bigtop-utils.default | 3 +++ bigtop-packages/src/common/hive/hive-metastore.svc | 4 ++++ bigtop-packages/src/common/hive/hive-server.svc | 4 ++++ bigtop-packages/src/common/oozie/catalina.properties | 2 +- bigtop-packages/src/common/sqoop/catalina.properties | 2 +- bigtop-packages/src/deb/bigtop-utils/rules | 2 ++ bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec | 6 ++++++ 7 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default b/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default index 153906d..5311848 100644 --- a/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default +++ b/bigtop-packages/src/common/bigtop-utils/bigtop-utils.default @@ -18,3 +18,6 @@ # Provide a colon-delimited list of directories to search for native Java libraries (e.g. libjvm.so) # export JAVA_NATIVE_PATH + +# Add common dependencies to the classpath (/var/lib/bigtop will already be included) +# export BIGTOP_CLASSPATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/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 66506f9..4fae311 100644 --- a/bigtop-packages/src/common/hive/hive-metastore.svc +++ b/bigtop-packages/src/common/hive/hive-metastore.svc @@ -40,6 +40,10 @@ start() { exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE` -Dhive.log.file=${DAEMON}.log -Dhive.log.threshold=INFO\"" + # Autodetect JDBC drivers for metastore + . /usr/lib/bigtop-utils/bigtop-detect-classpath + exec_env="HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${BIGTOP_CLASSPATH} $exec_env" + su -s /bin/sh $SVC_USER -c "$exec_env nohup nice -n 0 \ $EXEC_PATH --service metastore $PORT \ > $LOG_FILE 2>&1 < /dev/null & "'echo $! '"> $PIDFILE" http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/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 cac9efa..f9c59f8 100644 --- a/bigtop-packages/src/common/hive/hive-server.svc +++ b/bigtop-packages/src/common/hive/hive-server.svc @@ -40,6 +40,10 @@ start() { exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE` -Dhive.log.file=${DAEMON}.log -Dhive.log.threshold=INFO\"" + # Autodetect JDBC drivers for metastore + . /usr/lib/bigtop-utils/bigtop-detect-classpath + exec_env="HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${BIGTOP_CLASSPATH} $exec_env" + su -s /bin/sh $SVC_USER -c "$exec_env nohup nice -n 0 \ $EXEC_PATH --service hiveserver $PORT \ > $LOG_FILE 2>&1 < /dev/null & "'echo $! '"> $PIDFILE" http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/bigtop-packages/src/common/oozie/catalina.properties ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/oozie/catalina.properties b/bigtop-packages/src/common/oozie/catalina.properties index 21d7acb..6fd5d14 100755 --- a/bigtop-packages/src/common/oozie/catalina.properties +++ b/bigtop-packages/src/common/oozie/catalina.properties @@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository -common.loader=/var/lib/oozie/*.jar,/usr/lib/hadoop/client/*.jar,/usr/lib/oozie/libserver/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar +common.loader=/var/lib/oozie/*.jar,/usr/lib/hadoop/client/*.jar,/usr/lib/oozie/libserver/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/bigtop/*.jar # # List of comma-separated paths defining the contents of the "server" http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/bigtop-packages/src/common/sqoop/catalina.properties ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/sqoop/catalina.properties b/bigtop-packages/src/common/sqoop/catalina.properties index 9db1e56..2cd6138 100644 --- a/bigtop-packages/src/common/sqoop/catalina.properties +++ b/bigtop-packages/src/common/sqoop/catalina.properties @@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository -common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/sqoop/*.jar,/usr/lib/hadoop/client/*.jar +common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/sqoop/*.jar,/usr/lib/hadoop/client/*.jar,/var/lib/bigtop/*.jar # # List of comma-separated paths defining the contents of the "server" # classloader. Prefixes should be used to define what is the repository type. http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/bigtop-packages/src/deb/bigtop-utils/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/bigtop-utils/rules b/bigtop-packages/src/deb/bigtop-utils/rules index 92e9ad3..fb940ba 100644 --- a/bigtop-packages/src/deb/bigtop-utils/rules +++ b/bigtop-packages/src/deb/bigtop-utils/rules @@ -30,8 +30,10 @@ DISTRO_CODENAME=$(shell lsb_release -sc) override_dh_auto_install: # Copy repo file + install -d -p -m 755 debian/bigtop-utils/var/lib/bigtop/ install -d -p -m 755 debian/bigtop-utils/usr/lib/bigtop-utils/ install -p -m 755 debian/bigtop-detect-javahome debian/bigtop-utils/usr/lib/bigtop-utils/ install -p -m 755 debian/bigtop-detect-javalibs debian/bigtop-utils/usr/lib/bigtop-utils/ + install -p -m 755 debian/bigtop-detect-classpath debian/bigtop-utils/usr/lib/bigtop-utils/ install -d -p -m 755 debian/bigtop-utils/etc/default install -p -m 644 debian/bigtop-utils.default debian/bigtop-utils/etc/default/bigtop-utils http://git-wip-us.apache.org/repos/asf/bigtop/blob/9914667c/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec b/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec index bd0d5dc..a900700 100644 --- a/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec +++ b/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec @@ -14,6 +14,7 @@ # limitations under the License. %define lib_dir /usr/lib/bigtop-utils +%define plugins_dir /var/lib/bigtop Name: bigtop-utils Version: %{bigtop_utils_version} @@ -29,6 +30,7 @@ Source0: bigtop-detect-javahome Source1: LICENSE Source2: bigtop-utils.default Source3: bigtop-detect-javalibs +Source4: bigtop-detect-classpath Requires: bash @@ -50,15 +52,18 @@ install -p -m 644 %{SOURCE0} . install -p -m 644 %{SOURCE1} . install -p -m 644 %{SOURCE2} . install -p -m 644 %{SOURCE3} . +install -p -m 644 %{SOURCE4} . %build %install +install -d -p -m 755 $RPM_BUILD_ROOT%{plugins_dir}/ install -d -p -m 755 $RPM_BUILD_ROOT%{lib_dir}/ install -d -p -m 755 $RPM_BUILD_ROOT/etc/default install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{lib_dir}/ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{lib_dir}/ +install -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{lib_dir}/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/bigtop-utils %clean @@ -71,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/default/bigtop-utils %{lib_dir} +%{plugins_dir} %changelog
